summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-09-20Add linux-next specific files for 20100920next-20100920Stephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2010-09-20Merge remote branch 'irqflags/master'Stephen Rothwell
2010-09-20Merge remote branch 'bkl-config/config'Stephen Rothwell
2010-09-20Merge remote branch 'bkl-vfs/vfs'Stephen Rothwell
Conflicts: fs/nilfs2/super.c
2010-09-20Merge remote branch 'bkl-llseek/llseek'Stephen Rothwell
2010-09-20Merge remote branch 'bkl-trivial/trivial'Stephen Rothwell
Conflicts: drivers/char/pcmcia/cm4000_cs.c drivers/char/pcmcia/cm4040_cs.c drivers/mmc/card/block.c
2010-09-20Merge remote branch 'staging-next/staging-next'Stephen Rothwell
Conflicts: drivers/staging/Makefile drivers/staging/batman-adv/hard-interface.c drivers/staging/mrst-touchscreen/Makefile drivers/staging/mrst-touchscreen/intel-mid-touch.c
2010-09-20Merge branch 'quilt/usb'Stephen Rothwell
Conflicts: drivers/usb/gadget/rndis.c
2010-09-20Merge branch 'quilt/tty'Stephen Rothwell
2010-09-20Merge branch 'quilt/driver-core'Stephen Rothwell
Conflicts: drivers/misc/Makefile
2010-09-20Merge remote branch 'drivers-x86/linux-next'Stephen Rothwell
2010-09-20Merge remote branch 'workqueues/for-next'Stephen Rothwell
2010-09-20Merge remote branch 'percpu/for-next'Stephen Rothwell
Conflicts: mm/percpu.c
2010-09-20Merge remote branch 'oprofile/for-next'Stephen Rothwell
2010-09-20Merge remote branch 'lost-spurious-irq/lost-spurious-irq'Stephen Rothwell
Conflicts: drivers/ata/libata-core.c include/linux/libata.h
2010-09-20Merge remote branch 'tip/auto-latest'Stephen Rothwell
Conflicts: net/core/dev.c
2010-09-20Merge remote branch 'rcu/rcu/next'Stephen Rothwell
2010-09-20Merge remote branch 'omap_dss2/for-next'Stephen Rothwell
2010-09-20Merge remote branch 'i7core_edac/linux_next'Stephen Rothwell
Conflicts: MAINTAINERS
2010-09-20Merge remote branch 'alacrity/linux-next'Stephen Rothwell
Conflicts: include/linux/Kbuild
2010-09-20Merge remote branch 'catalin/for-next'Stephen Rothwell
Conflicts: arch/arm/include/asm/smp_plat.h arch/arm/kernel/Makefile
2010-09-20Merge remote branch 'irda/for-next'Stephen Rothwell
Conflicts: drivers/net/irda/irda-usb.c
2010-09-20Merge remote branch 'bluetooth/master'Stephen Rothwell
2010-09-20Merge remote branch 'suspend/linux-next'Stephen Rothwell
2010-09-20Merge branch 'quilt/aoe'Stephen Rothwell
2010-09-20Merge remote branch 'trivial/for-next'Stephen Rothwell
2010-09-20Merge remote branch 'watchdog/master'Stephen Rothwell
2010-09-20Merge remote branch 'uwb/for-upstream'Stephen Rothwell
2010-09-20Merge remote branch 'agp/agp-next'Stephen Rothwell
2010-09-20Merge remote branch 'security-testing/next'Stephen Rothwell
2010-09-20Merge remote branch 'voltage/for-next'Stephen Rothwell
2010-09-20Merge commit 'refs/next/20100917/viafb'Stephen Rothwell
2010-09-20Merge remote branch 'mfd/for-next'Stephen Rothwell
Conflicts: drivers/mfd/sh_mobile_sdhi.c
2010-09-20Merge remote branch 'slab/for-next'Stephen Rothwell
2010-09-20Merge remote branch 'kgdb/kgdb-next'Stephen Rothwell
2010-09-20Merge remote branch 'mmc/mmc-next'Stephen Rothwell
2010-09-20Merge remote branch 'leds/for-mm'Stephen Rothwell
2010-09-20Merge remote branch 'battery/master'Stephen Rothwell
2010-09-20Merge remote branch 'pcmcia/master'Stephen Rothwell
Conflicts: drivers/net/pcmcia/smc91c92_cs.c
2010-09-20Merge commit 'refs/next/20100916/block'Stephen Rothwell
Conflicts: block/blk-core.c drivers/block/loop.c
2010-09-20Merge remote branch 'input/next'Stephen Rothwell
2010-09-20Merge branch 'quilt/rr'Stephen Rothwell
2010-09-20Merge remote branch 'cpufreq/next'Stephen Rothwell
2010-09-20Merge remote branch 'sound/for-next'Stephen Rothwell
2010-09-20Merge remote branch 'sound-asoc/for-next'Stephen Rothwell
Conflicts: arch/arm/mach-s3c64xx/mach-smdk6410.c drivers/video/sh_mobile_hdmi.c
2010-09-20Merge remote branch 'crypto/master'Stephen Rothwell
2010-09-20Merge remote branch 'wireless/master'Stephen Rothwell
2010-09-20Merge remote branch 'net/master'Stephen Rothwell
Conflicts: drivers/net/pcmcia/pcnet_cs.c
2010-09-20Merge remote branch 'async_tx/next'Stephen Rothwell
2010-09-20Merge remote branch 'scsi/master'Stephen Rothwell