summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-01-06Merge commit 'kmemcheck/auto-kmemcheck-next'Stephen Rothwell
Conflicts: MAINTAINERS
2009-01-06Merge commit 'md/for-next'Stephen Rothwell
2009-01-06Merge commit 'kgdb/kgdb-next'Stephen Rothwell
2009-01-06Merge commit 'backlight/for-mm'Stephen Rothwell
2009-01-06Merge commit 'leds/for-mm'Stephen Rothwell
2009-01-06Merge commit 'firmware/master'Stephen Rothwell
Conflicts: drivers/net/starfire.c drivers/net/tg3.c firmware/Makefile firmware/WHENCE
2009-01-06Merge commit 'bkl-removal/bkl-removal'Stephen Rothwell
Conflicts: fs/ioctl.c
2009-01-06Merge commit 'gfs2/master'Stephen Rothwell
2009-01-06Merge commit 'cpufreq/next'Stephen Rothwell
2009-01-06Merge commit 'sound/for-next'Stephen Rothwell
2009-01-06Merge commit 'mtd/master'Stephen Rothwell
Conflicts: drivers/mtd/devices/m25p80.c drivers/mtd/devices/mtd_dataflash.c
2009-01-06Merge commit 'udf/for_next'Stephen Rothwell
2009-01-06Merge commit 'async_tx/next'Stephen Rothwell
2009-01-06Merge commit 'ext4/next'Stephen Rothwell
Conflicts: fs/ext4/ialloc.c
2009-01-06Merge commit 'ocfs2/linux-next'Stephen Rothwell
2009-01-06Merge commit 'scsi/master'Stephen Rothwell
Conflicts: drivers/scsi/scsi_ioctl.c
2009-01-06Merge commit 'dlm/next'Stephen Rothwell
2009-01-06Merge commit 'kvm/master'Stephen Rothwell
2009-01-06Merge commit 'ieee1394/for-next'Stephen Rothwell
2009-01-06Merge commit 'nfsd/nfsd-next'Stephen Rothwell
2009-01-06Merge commit 'acpi/test'Stephen Rothwell
2009-01-06Merge commit 'libata/NEXT'Stephen Rothwell
2009-01-06Merge branch 'quilt/ide'Stephen Rothwell
2009-01-06Merge commit 'v4l-dvb/master'Stephen Rothwell
2009-01-06Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2009-01-06Merge branch 'quilt/i2c'Stephen Rothwell
2009-01-06Merge commit 'hid/for-next'Stephen Rothwell
2009-01-06Merge branch 'quilt/device-mapper'Stephen Rothwell
2009-01-06Merge commit 'pci/linux-next'Stephen Rothwell
Conflicts: drivers/pci/hotplug/acpiphp_glue.c
2009-01-06Merge commit 'timers/auto-timers-next'Stephen Rothwell
Conflicts: kernel/time/tick-common.c
2009-01-06Merge commit 'stackprotector/auto-stackprotector-next'Stephen Rothwell
2009-01-06Merge commit 'sched/auto-sched-next'Stephen Rothwell
2009-01-06Merge commit 'safe-poison-pointers/auto-safe-poison-pointers-next'Stephen Rothwell
2009-01-06Merge commit 'genirq/auto-genirq-next'Stephen Rothwell
2009-01-06Merge commit 'ftrace/auto-ftrace-next'Stephen Rothwell
2009-01-06Merge commit 'cpus4096/auto-cpus4096-next'Stephen Rothwell
Conflicts: kernel/rcuclassic.c
2009-01-06Merge commit 'tip-core/auto-core-next'Stephen Rothwell
2009-01-06Merge branch 'quilt/usb'Stephen Rothwell
2009-01-06Merge branch 'quilt/driver-core'Stephen Rothwell
2009-01-06Merge commit 'xtensa/master'Stephen Rothwell
2009-01-06Merge commit 'x86/auto-x86-next'Stephen Rothwell
2009-01-06Merge commit 'sh/master'Stephen Rothwell
2009-01-06Merge commit 's390/features'Stephen Rothwell
2009-01-06Merge commit 'pxa/for-next'Stephen Rothwell
2009-01-06Merge commit 'powerpc/next'Stephen Rothwell
2009-01-06Merge commit 'parisc/master'Stephen Rothwell
2009-01-06Merge commit 'm68knommu/for-next'Stephen Rothwell
2009-01-06Merge commit 'cris/for-next'Stephen Rothwell
2009-01-06Merge commit 'avr32/avr32-arch'Stephen Rothwell
2009-01-06Merge commit 'arm/devel'Stephen Rothwell