summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-06-16Merge commit 'input/next'Stephen Rothwell
2008-06-16Merge commit 'gfs2/master'Stephen Rothwell
2008-06-16Merge commit 'mmc/next'Stephen Rothwell
2008-06-16Merge branch 'quilt/rr'Stephen Rothwell
2008-06-16Merge commit 'cpufreq/next'Stephen Rothwell
Conflicts: drivers/cpufreq/cpufreq.c
2008-06-16Merge commit 'arm/devel'Stephen Rothwell
Conflicts: arch/arm/mach-at91/board-yl-9200.c arch/arm/mach-pxa/tosa.c
2008-06-16Merge commit 'sound/master'Stephen Rothwell
2008-06-16Merge commit 'vfs/vfs-2.6.25'Stephen Rothwell
2008-06-16Merge commit 'crypto/master'Stephen Rothwell
2008-06-16Merge commit 'mtd/master'Stephen Rothwell
2008-06-16Merge commit 'galak/powerpc-next'Stephen Rothwell
Conflicts: Documentation/powerpc/booting-without-of.txt
2008-06-16Merge commit 'sparc/master'Stephen Rothwell
2008-06-16Merge commit 'net/master'Stephen Rothwell
Conflicts: Documentation/powerpc/booting-without-of.txt drivers/net/wireless/rt2x00/Kconfig drivers/net/wireless/rt2x00/rt2x00usb.c
2008-06-16Merge commit 'udf/for_next'Stephen Rothwell
2008-06-16Merge commit 'async_tx/next'Stephen Rothwell
2008-06-16Merge commit '4xx/next'Stephen Rothwell
2008-06-16Merge commit 'ext4/next'Stephen Rothwell
2008-06-16Merge commit 'powerpc/powerpc-next'Stephen Rothwell
2008-06-16Merge branch 'quilt/m68k'Stephen Rothwell
2008-06-16Merge commit 'selinux/for-akpm'Stephen Rothwell
2008-06-16Merge commit 'ocfs2/linux-next'Stephen Rothwell
2008-06-16Merge commit 'tests/master'Stephen Rothwell
Conflicts: lib/Kconfig.debug
2008-06-16Merge commit 'ia64/test'Stephen Rothwell
2008-06-16Merge commit 'scsi/master'Stephen Rothwell
2008-06-16Merge commit 'dlm/next'Stephen Rothwell
2008-06-16Merge commit 'kvm/master'Stephen Rothwell
2008-06-16Merge commit 'ubi/master'Stephen Rothwell
2008-06-16Merge commit 'hwmon/testing'Stephen Rothwell
2008-06-16Merge commit 'ieee1394/for-next'Stephen Rothwell
2008-06-16Merge commit 'nfsd/nfsd-next'Stephen Rothwell
Conflicts: net/sunrpc/svc.c
2008-06-16Merge commit 'acpi/test'Stephen Rothwell
Conflicts: drivers/acpi/processor_throttling.c drivers/acpi/sleep/main.c
2008-06-16Merge commit 'infiniband/for-next'Stephen Rothwell
2008-06-16Merge commit 'xfs/master'Stephen Rothwell
2008-06-16Merge commit 'libata/NEXT'Stephen Rothwell
2008-06-16ide pmac fixes 1Stephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2008-06-16Merge branch 'quilt/ide'Stephen Rothwell
2008-06-16Merge commit 'kbuild/master'Stephen Rothwell
2008-06-16Merge commit 'jfs/next'Stephen Rothwell
2008-06-16Merge commit 'sh/master'Stephen Rothwell
2008-06-16Merge commit 's390/features'Stephen Rothwell
Conflicts: drivers/s390/block/dasd.c drivers/s390/block/dasd_eckd.c drivers/s390/block/dasd_fba.c drivers/s390/char/tape_core.c drivers/s390/cio/device_fsm.c drivers/s390/net/claw.c drivers/s390/net/ctcm_main.c drivers/s390/net/lcs.c
2008-06-16Merge commit 'v4l-dvb/stable'Stephen Rothwell
2008-06-16Merge commit 'avr32/avr32-arch'Stephen Rothwell
2008-06-16Merge branch 'quilt/kernel-doc'Stephen Rothwell
2008-06-16Merge branch 'quilt/i2c'Stephen Rothwell
Conflicts: drivers/i2c/i2c-core.c
2008-06-16Merge commit 'hid/mm'Stephen Rothwell
2008-06-16Merge commit 'pci/linux-next'Stephen Rothwell
Conflicts: arch/x86/pci/irq.c include/linux/device.h
2008-06-16Merge commit 'x86/auto-x86-next'Stephen Rothwell
Conflicts: arch/x86/kernel/io_apic_32.c arch/x86/kernel/nmi_32.c arch/x86/kernel/process_32.c arch/x86/kernel/process_64.c
2008-06-16Merge commit 'timers/auto-timers-next'Stephen Rothwell
2008-06-16Merge commit 'stackprotector/auto-stackprotector-next'Stephen Rothwell
2008-06-16Merge commit 'sched/auto-sched-next'Stephen Rothwell
Conflicts: kernel/Makefile