summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-03-04Add linux-next specific files for 20090304next-20090304Stephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2009-03-04Merge branch 'quilt/staging'Stephen Rothwell
2009-03-04Merge commit 'kmemleak/kmemleak'Stephen Rothwell
Conflicts: Documentation/kernel-parameters.txt include/linux/slab.h init/main.c lib/Kconfig.debug mm/slab.c mm/slob.c mm/slub.c
2009-03-04Merge commit 'omap/for-next'Stephen Rothwell
2009-03-04Merge commit 'trivial/for-next'Stephen Rothwell
2009-03-04Merge commit 'jc_docs/docs-next'Stephen Rothwell
2009-03-04Merge commit 'osd/linux-next'Stephen Rothwell
2009-03-04Merge commit 'proc/proc'Stephen Rothwell
Conflicts: security/selinux/hooks.c
2009-03-04Merge commit 'watchdog/master'Stephen Rothwell
2009-03-04Merge commit 'iommu/auto-iommu-next'Stephen Rothwell
Conflicts: arch/x86/include/asm/dma-mapping.h
2009-03-04Merge commit 'sparseirq/auto-sparseirq-next'Stephen Rothwell
2009-03-04Merge commit 'oprofile/auto-oprofile-next'Stephen Rothwell
2009-03-04Merge commit 'kmemcheck/auto-kmemcheck-next'Stephen Rothwell
Conflicts: MAINTAINERS mm/Makefile
2009-03-04Merge branch 'quilt/ttydev'Stephen Rothwell
2009-03-04Merge commit 'lblnet/master'Stephen Rothwell
2009-03-04Merge commit 'security-testing/next'Stephen Rothwell
2009-03-04Merge commit 'voltage/for-next'Stephen Rothwell
2009-03-04Merge commit 'drm/drm-next'Stephen Rothwell
Conflicts: drivers/gpu/drm/drm_proc.c
2009-03-04Merge commit 'mfd/for-next'Stephen Rothwell
2009-03-04Merge commit 'md/for-next'Stephen Rothwell
2009-03-04Merge commit 'slab/for-next'Stephen Rothwell
Conflicts: include/linux/slub_def.h mm/slob.c mm/slub.c
2009-03-04Merge commit 'kgdb/kgdb-next'Stephen Rothwell
2009-03-04Merge commit 'backlight/for-mm'Stephen Rothwell
2009-03-04Merge commit 'leds/for-mm'Stephen Rothwell
2009-03-04Merge commit 'battery/master'Stephen Rothwell
2009-03-04Merge commit 'firmware/master'Stephen Rothwell
Conflicts: firmware/Makefile firmware/WHENCE sound/isa/Kconfig
2009-03-04Merge commit 'ubifs/linux-next'Stephen Rothwell
2009-03-04Merge commit 'bkl-removal/bkl-removal'Stephen Rothwell
2009-03-04Merge commit 'input/next'Stephen Rothwell
2009-03-04Merge commit 'gfs2/master'Stephen Rothwell
2009-03-04Merge commit 'mmc/next'Stephen Rothwell
2009-03-04Merge commit 'cifs/master'Stephen Rothwell
2009-03-04Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: arch/x86/include/asm/es7000/apic.h arch/x86/include/asm/numaq/apic.h drivers/hid/hid-core.c drivers/media/video/saa7134/saa7134-core.c drivers/media/video/saa7134/saa7134.h drivers/net/virtio_net.c kernel/module.c
2009-03-04Merge commit 'v9fs/for-next'Stephen Rothwell
Conflicts: net/9p/protocol.c
2009-03-04Merge commit 'cpufreq/next'Stephen Rothwell
2009-03-04Merge commit 'sound/for-next'Stephen Rothwell
Conflicts: sound/soc/pxa/pxa2xx-i2s.c
2009-03-04Merge commit 'crypto/master'Stephen Rothwell
2009-03-04Merge commit 'wireless/master'Stephen Rothwell
2009-03-04Merge commit 'net/master'Stephen Rothwell
Conflicts: drivers/net/wimax/i2400m/usb-notif.c drivers/net/wireless/rt2x00/rt73usb.c
2009-03-04Merge commit 'udf/for_next'Stephen Rothwell
2009-03-04Merge commit 'async_tx/next'Stephen Rothwell
2009-03-04Merge commit 'ext4/next'Stephen Rothwell
Conflicts: fs/ext4/inode.c
2009-03-04Merge commit 'ocfs2/linux-next'Stephen Rothwell
Conflicts: fs/ocfs2/ocfs2.h
2009-03-04Merge commit 'scsi/master'Stephen Rothwell
2009-03-04Merge commit 'dlm/next'Stephen Rothwell
2009-03-04Merge commit 'kvm/master'Stephen Rothwell
2009-03-04Merge commit 'ubi/linux-next'Stephen Rothwell
2009-03-04Merge commit 'ieee1394/for-next'Stephen Rothwell
2009-03-04Merge commit 'nfsd/nfsd-next'Stephen Rothwell
2009-03-04Merge commit 'acpi/test'Stephen Rothwell