Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2026-11-13 07:31:07 +00:00 · 2011-08-04 12:04:12 -05:00 · 2011-08-04 12:04:12 -05:00 · c25bdbe288
commit c25bdbe288
parent 275d38585c c027a474a6
98 changed files with 3685 additions and 2800 deletions
--- a/Documentation/ABI/testing/pstore
+++ b/Documentation/ABI/testing/pstore
--- a/Documentation/dmaengine.txt
+++ b/Documentation/dmaengine.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
--- a/arch/ia64/include/asm/gpio.h
+++ b/arch/ia64/include/asm/gpio.h
--- a/drivers/acpi/apei/erst.c
+++ b/drivers/acpi/apei/erst.c
--- a/drivers/base/devtmpfs.c
+++ b/drivers/base/devtmpfs.c
--- a/drivers/dma/TODO
+++ b/drivers/dma/TODO
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
--- a/drivers/dma/coh901318.c
+++ b/drivers/dma/coh901318.c
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
--- a/drivers/dma/ep93xx_dma.c
+++ b/drivers/dma/ep93xx_dma.c
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
--- a/drivers/dma/intel_mid_dma.c
+++ b/drivers/dma/intel_mid_dma.c
--- a/drivers/dma/ipu/ipu_idmac.c
+++ b/drivers/dma/ipu/ipu_idmac.c
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
--- a/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
--- a/drivers/dma/pch_dma.c
+++ b/drivers/dma/pch_dma.c
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
--- a/drivers/dma/ste_dma40_ll.h
+++ b/drivers/dma/ste_dma40_ll.h
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
--- a/drivers/regulator/dummy.c
+++ b/drivers/regulator/dummy.c
--- a/drivers/regulator/tps65910-regulator.c
+++ b/drivers/regulator/tps65910-regulator.c
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
--- a/drivers/regulator/wm831x-dcdc.c
+++ b/drivers/regulator/wm831x-dcdc.c
--- a/drivers/regulator/wm831x-ldo.c
+++ b/drivers/regulator/wm831x-ldo.c
--- a/drivers/regulator/wm8994-regulator.c
+++ b/drivers/regulator/wm8994-regulator.c
--- a/fs/9p/acl.c
+++ b/fs/9p/acl.c
--- a/fs/9p/acl.h
+++ b/fs/9p/acl.h
--- a/fs/9p/vfs_inode_dotl.c
+++ b/fs/9p/vfs_inode_dotl.c
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
--- a/fs/dcache.c
+++ b/fs/dcache.c
--- a/fs/ext2/acl.c
+++ b/fs/ext2/acl.c
--- a/fs/ext3/acl.c
+++ b/fs/ext3/acl.c
--- a/fs/ext4/Makefile
+++ b/fs/ext4/Makefile
--- a/fs/ext4/acl.c
+++ b/fs/ext4/acl.c
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
--- a/fs/ext4/block_validity.c
+++ b/fs/ext4/block_validity.c
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
--- a/fs/ext4/fsync.c
+++ b/fs/ext4/fsync.c
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
--- a/fs/ext4/indirect.c
+++ b/fs/ext4/indirect.c
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
--- a/fs/ext4/mballoc.h
+++ b/fs/ext4/mballoc.h
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
--- a/fs/ext4/page-io.c
+++ b/fs/ext4/page-io.c
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
--- a/fs/ext4/truncate.h
+++ b/fs/ext4/truncate.h
--- a/fs/generic_acl.c
+++ b/fs/generic_acl.c
--- a/fs/gfs2/acl.c
+++ b/fs/gfs2/acl.c
--- a/fs/hppfs/hppfs.c
+++ b/fs/hppfs/hppfs.c
--- a/fs/inode.c
+++ b/fs/inode.c
--- a/fs/jbd2/checkpoint.c
+++ b/fs/jbd2/checkpoint.c
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
--- a/fs/jffs2/acl.c
+++ b/fs/jffs2/acl.c
--- a/fs/jffs2/acl.h
+++ b/fs/jffs2/acl.h
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
--- a/fs/jffs2/os-linux.h
+++ b/fs/jffs2/os-linux.h
--- a/fs/jfs/acl.c
+++ b/fs/jfs/acl.c
--- a/fs/jfs/xattr.c
+++ b/fs/jfs/xattr.c
--- a/fs/namei.c
+++ b/fs/namei.c
--- a/fs/nfs/nfs3acl.c
+++ b/fs/nfs/nfs3acl.c
--- a/fs/nfs/nfs3proc.c
+++ b/fs/nfs/nfs3proc.c
--- a/fs/ocfs2/acl.c
+++ b/fs/ocfs2/acl.c
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
--- a/fs/pstore/inode.c
+++ b/fs/pstore/inode.c
--- a/fs/pstore/internal.h
+++ b/fs/pstore/internal.h
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
--- a/fs/reiserfs/xattr_acl.c
+++ b/fs/reiserfs/xattr_acl.c
--- a/fs/xfs/linux-2.6/xfs_acl.c
+++ b/fs/xfs/linux-2.6/xfs_acl.c
--- a/include/linux/amba/pl08x.h
+++ b/include/linux/amba/pl08x.h
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
--- a/include/linux/posix_acl.h
+++ b/include/linux/posix_acl.h
--- a/include/linux/pstore.h
+++ b/include/linux/pstore.h
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
--- a/include/trace/events/jbd2.h
+++ b/include/trace/events/jbd2.h
--- a/kernel/debug/gdbstub.c
+++ b/kernel/debug/gdbstub.c
--- a/kernel/debug/kdb/kdb_bt.c
+++ b/kernel/debug/kdb/kdb_bt.c
--- a/kernel/debug/kdb/kdb_cmds
+++ b/kernel/debug/kdb/kdb_cmds
--- a/kernel/debug/kdb/kdb_debugger.c
+++ b/kernel/debug/kdb/kdb_debugger.c
--- a/kernel/debug/kdb/kdb_io.c
+++ b/kernel/debug/kdb/kdb_io.c
--- a/kernel/debug/kdb/kdb_main.c
+++ b/kernel/debug/kdb/kdb_main.c
--- a/kernel/debug/kdb/kdb_private.h
+++ b/kernel/debug/kdb/kdb_private.h
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c