summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-06-26Add linux-next specific files for 20090626next-20090626Stephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2009-06-26Revert "HID: use debugfs for report dumping descriptor"Stephen Rothwell
This reverts commit a635f9dd83f3382577f4544a96df12356e951a40.
2009-06-26Revert "HID: use debugfs for events/reports dumping"Stephen Rothwell
This reverts commit cd667ce24796700e1a0e6e7528efc61c96ff832e.
2009-06-26kvm/powerpc: fix build errorStephen Rothwell
In file included from include/trace/events/kvm.h:57, from arch/powerpc/kvm/../../../virt/kvm/kvm_main.c:63: include/trace/define_trace.h:53:43: error: trace/events/TRACE_SYSTEM.h: No such file or directory Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2009-06-26Merge branch 'quilt/staging'Stephen Rothwell
2009-06-26Merge branch 'quilt/usb'Stephen Rothwell
2009-06-26Merge branch 'quilt/driver-core'Stephen Rothwell
2009-06-26Merge commit 'asm-generic/next'Stephen Rothwell
2009-06-26Merge commit 'tip/auto-latest'Stephen Rothwell
Conflicts: arch/x86/include/asm/termios.h
2009-06-26Merge commit 'hwlat/for-linus'Stephen Rothwell
2009-06-26Merge commit 'edac-amd/for-next'Stephen Rothwell
2009-06-26Merge commit 'bluetooth/master'Stephen Rothwell
2009-06-26Merge commit 'trivial/for-next'Stephen Rothwell
2009-06-26Merge commit 'osd/linux-next'Stephen Rothwell
2009-06-26Merge commit 'cputime/cputime'Stephen Rothwell
2009-06-26Merge branch 'quilt/ttydev'Stephen Rothwell
2009-06-26Merge commit 'security-testing/next'Stephen Rothwell
2009-06-26Merge commit 'voltage/for-next'Stephen Rothwell
2009-06-26Merge commit 'mfd/for-next'Stephen Rothwell
2009-06-26Merge commit 'slab/for-next'Stephen Rothwell
2009-06-26Merge commit 'kgdb/kgdb-next'Stephen Rothwell
2009-06-26Merge commit 'backlight/for-mm'Stephen Rothwell
2009-06-26Merge commit 'leds/for-mm'Stephen Rothwell
2009-06-26Revert "Restore barrier support for md and probably other virtual devices."Stephen Rothwell
This reverts commit 6cf2a6c8d01514e86a8d38e4eeed402378b635dc.
2009-06-26Merge commit 'block/for-next'Stephen Rothwell
2009-06-26UML: Fix some apparent bitrot in mmu_context.hPaul Menage
UML: Fix some apparent bitrot in mmu_context.h - cpumask_clear() -> cpumask_clear_cpu() Signed-off-by: Paul Menage <menage@google.com> -- Fixes the following compile errors: arch/um/include/asm/mmu_context.h: In function 'switch_mm': arch/um/include/asm/mmu_context.h:38: warning: passing argument 1 of 'cpumask_clear' makes pointer from integer without a cast arch/um/include/asm/mmu_context.h:38: error: too many arguments to function 'cpumask_clear'
2009-06-26Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: kernel/cpu.c
2009-06-26Merge commit 'sound/for-next'Stephen Rothwell
2009-06-26Merge commit 'crypto/master'Stephen Rothwell
2009-06-26Merge commit 'mtd/master'Stephen Rothwell
2009-06-26Merge commit 'async_tx/next'Stephen Rothwell
2009-06-26Merge commit 'kvm/master'Stephen Rothwell
2009-06-26Merge commit 'ieee1394/for-next'Stephen Rothwell
2009-06-26Merge commit 'acpi/test'Stephen Rothwell
2009-06-26Merge commit 'libata/NEXT'Stephen Rothwell
2009-06-26Merge commit 'v4l-dvb/master'Stephen Rothwell
2009-06-26Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2009-06-26Merge branch 'quilt/i2c'Stephen Rothwell
2009-06-26Merge commit 'hid/for-next'Stephen Rothwell
2009-06-26Merge commit 'reiserfs-bkl/reiserfs/kill-bkl-rc6'Stephen Rothwell
Conflicts: fs/reiserfs/super.c
2009-06-26Merge commit 'v9fs/for-next'Stephen Rothwell
Conflicts: net/9p/protocol.c
2009-06-26Merge commit 'nilfs2/for-next'Stephen Rothwell
2009-06-26Merge commit 'gfs2/master'Stephen Rothwell
2009-06-26Merge commit 'fuse/for-next'Stephen Rothwell
2009-06-26Merge commit 'configfs/linux-next'Stephen Rothwell
Conflicts: fs/configfs/dir.c
2009-06-26Merge commit 'cifs/master'Stephen Rothwell
2009-06-26Merge commit 'xtensa/master'Stephen Rothwell
2009-06-26Merge commit 'sh/master'Stephen Rothwell
2009-06-26Merge commit 's390/features'Stephen Rothwell
2009-06-26Merge commit 'galak/next'Stephen Rothwell