summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-03-25Add linux-next specific files for 20100325next-20100325Stephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2010-03-25Merge branch 'quilt/usb'Stephen Rothwell
2010-03-25Merge branch 'quilt/driver-core'Stephen Rothwell
2010-03-25Merge remote branch 'workqueues/for-next'Stephen Rothwell
2010-03-25Merge remote branch 'tip/auto-latest'Stephen Rothwell
2010-03-25Merge remote branch 'limits/writable_limits'Stephen Rothwell
Conflicts: arch/x86/ia32/ia32entry.S arch/x86/include/asm/unistd_32.h arch/x86/include/asm/unistd_64.h arch/x86/kernel/syscall_table_32.S
2010-03-25Merge remote branch 'devicetree/next-devicetree'Stephen Rothwell
2010-03-25Merge remote branch 'i7core_edac/linux_next'Stephen Rothwell
2010-03-25Merge remote branch 'alacrity/linux-next'Stephen Rothwell
Conflicts: include/linux/Kbuild lib/Kconfig
2010-03-25Merge remote branch 'hwlat/for-linus'Stephen Rothwell
Conflicts: MAINTAINERS drivers/misc/Makefile
2010-03-25Merge remote branch 'irda/for-next'Stephen Rothwell
Conflicts: drivers/net/irda/irda-usb.c
2010-03-25Merge remote branch 'fsnotify/for-next'Stephen Rothwell
Conflicts: fs/notify/inotify/inotify_user.c include/linux/fsnotify.h kernel/audit_tree.c kernel/sysctl.c
2010-03-25Merge remote branch 'suspend/linux-next'Stephen Rothwell
2010-03-25Merge branch 'quilt/aoe'Stephen Rothwell
2010-03-25Merge remote branch 'trivial/for-next'Stephen Rothwell
2010-03-25Merge remote branch 'dwmw2-iommu/master'Stephen Rothwell
2010-03-25Merge remote branch 'agp/agp-next'Stephen Rothwell
2010-03-25Merge remote branch 'security-testing/next'Stephen Rothwell
2010-03-25Merge remote branch 'voltage/for-next'Stephen Rothwell
2010-03-25Merge remote branch 'drm/drm-next'Stephen Rothwell
2010-03-25Merge remote branch 'mfd/for-next'Stephen Rothwell
2010-03-25Merge remote branch 'md/for-next'Stephen Rothwell
2010-03-25Merge remote branch 'slab/for-next'Stephen Rothwell
2010-03-25Merge remote branch 'kgdb/kgdb-next'Stephen Rothwell
2010-03-25Merge remote branch 'pcmcia/master'Stephen Rothwell
2010-03-25Merge branch 'quilt/device-mapper'Stephen Rothwell
2010-03-25Merge remote branch 'block/for-next'Stephen Rothwell
2010-03-25Merge remote branch 'input/next'Stephen Rothwell
2010-03-25Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: MAINTAINERS drivers/char/hvc_console.c drivers/char/hvc_console.h drivers/char/virtio_console.c
2010-03-25Merge remote branch 'sound/for-next'Stephen Rothwell
2010-03-25Merge remote branch 'crypto/master'Stephen Rothwell
2010-03-25Merge remote branch 'mtd/master'Stephen Rothwell
Conflicts: drivers/mtd/nand/sh_flctl.c
2010-03-25Merge remote branch 'wireless/master'Stephen Rothwell
2010-03-25Merge remote branch 'net/master'Stephen Rothwell
2010-03-25Merge remote branch 'async_tx/next'Stephen Rothwell
2010-03-25Merge remote branch 'ieee1394/for-next'Stephen Rothwell
2010-03-25Merge remote branch 'acpi/test'Stephen Rothwell
2010-03-25Merge remote branch 'libata/NEXT'Stephen Rothwell
Conflicts: drivers/ata/ahci.c
2010-03-25Merge remote branch 'kconfig/for-next'Stephen Rothwell
2010-03-25Merge remote branch 'kbuild/for-next'Stephen Rothwell
2010-03-25Merge remote branch 'v4l-dvb/master'Stephen Rothwell
2010-03-25Merge branch 'quilt/kernel-doc'Stephen Rothwell
2010-03-25Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2010-03-25Merge branch 'quilt/i2c'Stephen Rothwell
2010-03-25Merge remote branch 'hid/for-next'Stephen Rothwell
2010-03-25Merge remote branch 'pci/linux-next'Stephen Rothwell
2010-03-25Merge remote branch 'vfs/for-next'Stephen Rothwell
Conflicts: fs/namei.c fs/nfs/inode.c fs/nfsd/nfs4xdr.c fs/ufs/inode.c fs/xfs/linux-2.6/xfs_super.c security/tomoyo/realpath.c
2010-03-25Merge remote branch 'ocfs2/linux-next'Stephen Rothwell
2010-03-25Merge remote branch 'nilfs2/for-next'Stephen Rothwell
2010-03-25Merge remote branch 'nfsd/nfsd-next'Stephen Rothwell