summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-02-06Add linux-next specific files for 20090206next-20090206Stephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2009-02-06Merge branch 'quilt/staging'Stephen Rothwell
2009-02-06Merge commit 'kmemleak/kmemleak'Stephen Rothwell
Conflicts: include/linux/slab.h init/main.c lib/Kconfig.debug mm/slab.c mm/slob.c mm/slub.c
2009-02-06Merge commit 'omap/for-next'Stephen Rothwell
2009-02-06Merge commit 'squashfs/master'Stephen Rothwell
2009-02-06Merge commit 'trivial/for-next'Stephen Rothwell
2009-02-06Merge commit 'jc_docs/docs-next'Stephen Rothwell
2009-02-06Merge commit 'osd/linux-next'Stephen Rothwell
2009-02-06Merge commit 'dwmw2-iommu/master'Stephen Rothwell
Conflicts: drivers/pci/intel-iommu.c include/linux/dma_remapping.h
2009-02-06Merge commit 'proc/proc'Stephen Rothwell
2009-02-06Merge commit 'watchdog/master'Stephen Rothwell
2009-02-06Merge commit 'iommu/auto-iommu-next'Stephen Rothwell
Conflicts: arch/x86/include/asm/dma-mapping.h
2009-02-06Merge commit 'sparseirq/auto-sparseirq-next'Stephen Rothwell
Conflicts: kernel/irq/handle.c
2009-02-06Merge commit 'oprofile/auto-oprofile-next'Stephen Rothwell
2009-02-06Merge branch 'quilt/ttydev'Stephen Rothwell
2009-02-06Merge commit 'lblnet/master'Stephen Rothwell
2009-02-06Merge commit 'voltage/for-next'Stephen Rothwell
2009-02-06Merge commit 'drm/drm-next'Stephen Rothwell
2009-02-06Merge commit 'mfd/for-next'Stephen Rothwell
2009-02-06Merge commit 'kmemcheck/auto-kmemcheck-next'Stephen Rothwell
Conflicts: MAINTAINERS arch/x86/mm/fault.c mm/Makefile
2009-02-06Merge commit 'slab/for-next'Stephen Rothwell
Conflicts: include/linux/slub_def.h mm/slob.c mm/slub.c
2009-02-06Merge commit 'kgdb/kgdb-next'Stephen Rothwell
2009-02-06Merge commit 'backlight/for-mm'Stephen Rothwell
2009-02-06Merge commit 'leds/for-mm'Stephen Rothwell
2009-02-06Merge commit 'battery/master'Stephen Rothwell
2009-02-06Merge commit 'firmware/master'Stephen Rothwell
Conflicts: sound/isa/Kconfig
2009-02-06Merge commit 'bkl-removal/bkl-removal'Stephen Rothwell
2009-02-06Merge commit 'input/next'Stephen Rothwell
2009-02-06Merge commit 'gfs2/master'Stephen Rothwell
2009-02-06Merge commit 'mmc/next'Stephen Rothwell
2009-02-06Merge commit 'cifs/master'Stephen Rothwell
2009-02-06Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: arch/x86/kernel/cpu/cpufreq/powernow-k8.c drivers/net/virtio_net.c
2009-02-06Merge commit 'v9fs/for-next'Stephen Rothwell
2009-02-06Merge commit 'cpufreq/next'Stephen Rothwell
2009-02-06Merge commit 'sound/for-next'Stephen Rothwell
2009-02-06Merge commit 'crypto/master'Stephen Rothwell
2009-02-06Merge commit 'wireless/master'Stephen Rothwell
2009-02-06Merge commit 'mtd/master'Stephen Rothwell
2009-02-06Merge commit 'net/master'Stephen Rothwell
Conflicts: drivers/net/wireless/iwlwifi/iwl-agn.c drivers/net/wireless/iwlwifi/iwl3945-base.c
2009-02-06Merge commit 'udf/for_next'Stephen Rothwell
2009-02-06Merge commit 'ext4/next'Stephen Rothwell
Conflicts: fs/ext4/ext4.h
2009-02-06Merge commit 'ocfs2/linux-next'Stephen Rothwell
2009-02-06Merge commit 'scsi/master'Stephen Rothwell
2009-02-06Merge commit 'dlm/next'Stephen Rothwell
2009-02-06Merge commit 'kvm/master'Stephen Rothwell
2009-02-06Merge commit 'ieee1394/for-next'Stephen Rothwell
2009-02-06Merge commit 'nfsd/nfsd-next'Stephen Rothwell
2009-02-06Revert "platform/x86: Add oqo-wmi driver for model 2 OQO backlight and ↵Stephen Rothwell
rfkill control" This reverts commit 03919980ad590ad5c5c181d1bd7d58513ad170bc.
2009-02-06Merge commit 'acpi/test'Stephen Rothwell
2009-02-06Merge commit 'infiniband/for-next'Stephen Rothwell