summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-08-25Add linux-next specific files for 20090825next-20090825Stephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2009-08-25Merge branch 'quilt/staging'Stephen Rothwell
Conflicts: drivers/staging/epl/VirtualEthernetLinux.c
2009-08-25Merge branch 'quilt/usb'Stephen Rothwell
2009-08-25Merge branch 'quilt/tty'Stephen Rothwell
Conflicts: arch/x86/include/asm/termios.h
2009-08-25Merge branch 'quilt/driver-core'Stephen Rothwell
Conflicts: drivers/base/class.c init/main.c
2009-08-25Merge commit 'hwpoison/hwpoison'Stephen Rothwell
2009-08-25Merge commit 'asm-generic/next'Stephen Rothwell
2009-08-25Merge commit 'sfi/sfi-test'Stephen Rothwell
Conflicts: arch/x86/include/asm/io_apic.h arch/x86/kernel/acpi/boot.c arch/x86/kernel/apic/io_apic.c drivers/acpi/internal.h drivers/acpi/tables.c include/linux/acpi.h
2009-08-25Merge commit 'percpu/for-next'Stephen Rothwell
Conflicts: arch/sh/kernel/vmlinux.lds.S
2009-08-25Merge commit 'edac-amd/for-next'Stephen Rothwell
Conflicts: arch/x86/kernel/smpboot.c include/linux/topology.h
2009-08-25Merge commit 'oprofile/for-next'Stephen Rothwell
Conflicts: kernel/trace/ring_buffer.c
2009-08-25Merge commit 'tip/auto-latest'Stephen Rothwell
Conflicts: arch/x86/include/asm/socket.h include/linux/rcupdate.h kernel/fork.c kernel/trace/trace.h
2009-08-25Merge commit 'kmemleak/kmemleak'Stephen Rothwell
2009-08-25Merge commit 'drbd/drbd'Stephen Rothwell
2009-08-25Merge commit 'hwlat/for-linus'Stephen Rothwell
2009-08-25Merge commit 'fsnotify/for-next'Stephen Rothwell
2009-08-25Merge commit 'bluetooth/master'Stephen Rothwell
2009-08-25Merge commit 'suspend/linux-next'Stephen Rothwell
2009-08-25Merge branch 'quilt/aoe'Stephen Rothwell
2009-08-25Merge commit 'omap/for-next'Stephen Rothwell
2009-08-25Merge commit 'trivial/for-next'Stephen Rothwell
2009-08-25Merge commit 'jc_docs/docs-next'Stephen Rothwell
2009-08-25Merge commit 'osd/linux-next'Stephen Rothwell
2009-08-25Merge commit 'cputime/cputime'Stephen Rothwell
2009-08-25Merge commit 'dwmw2-iommu/master'Stephen Rothwell
2009-08-25Merge commit 'watchdog/master'Stephen Rothwell
2009-08-25Merge commit 'agp/agp-next'Stephen Rothwell
Conflicts: drivers/char/agp/uninorth-agp.c
2009-08-25Merge commit 'security-testing/next'Stephen Rothwell
2009-08-25Merge commit 'voltage/for-next'Stephen Rothwell
Conflicts: drivers/regulator/Kconfig
2009-08-25Merge commit 'drm/drm-next'Stephen Rothwell
2009-08-25Merge commit 'mfd/for-next'Stephen Rothwell
Conflicts: drivers/input/misc/Kconfig
2009-08-25Merge commit 'slab/for-next'Stephen Rothwell
2009-08-25Merge commit 'kgdb/kgdb-next'Stephen Rothwell
2009-08-25Merge commit 'battery/master'Stephen Rothwell
2009-08-25Merge commit 'block/for-next'Stephen Rothwell
2009-08-25Merge commit 'input/next'Stephen Rothwell
Conflicts: drivers/base/platform.c
2009-08-25Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: include/linux/cpumask.h
2009-08-25Merge commit 'cpufreq/next'Stephen Rothwell
2009-08-25Merge commit 'sound/for-next'Stephen Rothwell
2009-08-25Merge commit 'crypto/master'Stephen Rothwell
2009-08-25Merge commit 'wireless/master'Stephen Rothwell
2009-08-25Merge commit 'net/master'Stephen Rothwell
2009-08-25Merge commit 'udf/for_next'Stephen Rothwell
2009-08-25Merge commit 'scsi/master'Stephen Rothwell
2009-08-25Merge commit 'dlm/next'Stephen Rothwell
2009-08-25Merge commit 'kvm/master'Stephen Rothwell
2009-08-25Merge commit 'ubi/linux-next'Stephen Rothwell
2009-08-25Merge commit 'ieee1394/for-next'Stephen Rothwell
2009-08-25Merge commit 'acpi/test'Stephen Rothwell
2009-08-25Merge commit 'infiniband/for-next'Stephen Rothwell