summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-12-01Add linux-next specific files for 20081201next-20081201Stephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2008-12-01Merge branch 'quilt/staging'Stephen Rothwell
2008-12-01Merge commit 'trivial/for-next'Stephen Rothwell
2008-12-01Merge commit 'fuse/for-next'Stephen Rothwell
2008-12-01Merge commit 'fatfs/master'Stephen Rothwell
2008-12-01Merge commit 'osd/linux-next'Stephen Rothwell
2008-12-01Merge commit 'cputime/cputime'Stephen Rothwell
Conflicts: kernel/sched.c
2008-12-01Merge commit 'dwmw2-iommu/master'Stephen Rothwell
2008-12-01Merge commit 'proc/proc'Stephen Rothwell
Conflicts: fs/proc/base.c kernel/exit.c
2008-12-01Merge commit 'watchdog/master'Stephen Rothwell
2008-12-01Merge commit 'uwb/for-upstream'Stephen Rothwell
2008-12-01Merge commit 'iommu/auto-iommu-next'Stephen Rothwell
2008-12-01Merge commit 'sparseirq/auto-sparseirq-next'Stephen Rothwell
2008-12-01Merge branch 'quilt/ttydev'Stephen Rothwell
Conflicts: fs/devpts/inode.c
2008-12-01Merge commit 'lblnet/master'Stephen Rothwell
2008-12-01Merge commit 'security-testing/next'Stephen Rothwell
Conflicts: fs/nfsd/nfs4recover.c fs/ocfs2/namei.c fs/xfs/linux-2.6/xfs_cred.h fs/xfs/linux-2.6/xfs_globals.h fs/xfs/xfs_vnodeops.h
2008-12-01Merge commit 'voltage/for-next'Stephen Rothwell
2008-12-01Merge commit 'drm/drm-next'Stephen Rothwell
2008-12-01Merge commit 'hdlc/hdlc-next'Stephen Rothwell
2008-12-01Merge commit 'mfd/for-next'Stephen Rothwell
2008-12-01Merge commit 'kmemcheck/auto-kmemcheck-next'Stephen Rothwell
Conflicts: MAINTAINERS arch/x86/mm/Makefile mm/slab.c mm/slub.c
2008-12-01Merge commit 'md/for-next'Stephen Rothwell
2008-12-01Merge commit 'slab/for-next'Stephen Rothwell
2008-12-01Merge commit 'kgdb/kgdb-next'Stephen Rothwell
2008-12-01Merge commit 'backlight/for-mm'Stephen Rothwell
2008-12-01Merge commit 'leds/for-mm'Stephen Rothwell
2008-12-01Merge commit 'firmware/master'Stephen Rothwell
Conflicts: drivers/net/tg3.c firmware/Makefile firmware/WHENCE
2008-12-01Merge commit 'block/for-next'Stephen Rothwell
2008-12-01Merge commit 'ubifs/linux-next'Stephen Rothwell
2008-12-01Merge commit 'input/next'Stephen Rothwell
2008-12-01Merge commit 'gfs2/master'Stephen Rothwell
2008-12-01Merge commit 'mmc/next'Stephen Rothwell
2008-12-01Merge commit 'cifs/master'Stephen Rothwell
2008-12-01Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: arch/x86/kernel/io_apic.c arch/x86/kernel/setup.c kernel/irq/manage.c kernel/irq/proc.c
2008-12-01Merge commit 'v9fs/for-next'Stephen Rothwell
2008-12-01Merge commit 'cpufreq/next'Stephen Rothwell
2008-12-01Merge commit 'sound/for-next'Stephen Rothwell
2008-12-01Merge commit 'crypto/master'Stephen Rothwell
2008-12-01Merge commit 'mtd/master'Stephen Rothwell
Conflicts: drivers/mtd/maps/physmap.c
2008-12-01Merge commit 'net/master'Stephen Rothwell
Conflicts: drivers/net/ixgbe/ixgbe_main.c drivers/net/smc91x.c
2008-12-01Merge commit 'udf/for_next'Stephen Rothwell
2008-12-01Merge commit 'async_tx/next'Stephen Rothwell
2008-12-01Merge commit 'ext4/next'Stephen Rothwell
2008-12-01Merge commit 'ocfs2/linux-next'Stephen Rothwell
2008-12-01Merge commit 'scsi/master'Stephen Rothwell
2008-12-01Merge commit 'dlm/next'Stephen Rothwell
2008-12-01Merge commit 'kvm/master'Stephen Rothwell
Conflicts: arch/x86/kernel/reboot.c
2008-12-01Merge commit 'ieee1394/for-next'Stephen Rothwell
2008-12-01Merge commit 'nfsd/nfsd-next'Stephen Rothwell
2008-12-01Merge commit 'acpi/test'Stephen Rothwell
Conflicts: drivers/acpi/blacklist.c