summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-08-23Add linux-next specific files for 20100823next-20100823Stephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2010-08-23net/sched: need to include net/ip6_checksum.hStephen Rothwell
for the declararion of csum_ipv6_magic. Fixes this build error on PowerPC (at least): net/sched/act_csum.c: In function 'tcf_csum_ipv6_icmp': net/sched/act_csum.c:178: error: implicit declaration of function 'csum_ipv6_magic' Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2010-08-23Merge remote branch 'drivers-x86/linux-next'Stephen Rothwell
2010-08-23Merge remote branch 'lost-spurious-irq/lost-spurious-irq'Stephen Rothwell
Conflicts: drivers/ata/libata-core.c include/linux/libata.h
2010-08-23Merge remote branch 'tip/auto-latest'Stephen Rothwell
2010-08-23Merge remote branch 'spi/next-spi'Stephen Rothwell
2010-08-23Merge remote branch 'i7core_edac/linux_next'Stephen Rothwell
Conflicts: MAINTAINERS
2010-08-23Merge remote branch 'alacrity/linux-next'Stephen Rothwell
Conflicts: include/linux/Kbuild
2010-08-23Merge remote branch 'catalin/for-next'Stephen Rothwell
2010-08-23Merge remote branch 'irda/for-next'Stephen Rothwell
Conflicts: drivers/net/irda/irda-usb.c
2010-08-23Merge remote branch 'fsnotify/for-next'Stephen Rothwell
2010-08-23Merge remote branch 'bluetooth/master'Stephen Rothwell
2010-08-23Merge branch 'quilt/aoe'Stephen Rothwell
2010-08-23Merge remote branch 'trivial/for-next'Stephen Rothwell
2010-08-23Merge remote branch 'uwb/for-upstream'Stephen Rothwell
2010-08-23Merge remote branch 'agp/agp-next'Stephen Rothwell
2010-08-23Merge remote branch 'security-testing/next'Stephen Rothwell
2010-08-23Merge remote branch 'voltage/for-next'Stephen Rothwell
2010-08-23Merge remote branch 'viafb/viafb-next'Stephen Rothwell
2010-08-23Merge remote branch 'mfd/for-next'Stephen Rothwell
2010-08-23Merge remote branch 'kgdb/kgdb-next'Stephen Rothwell
2010-08-23Merge remote branch 'leds/for-mm'Stephen Rothwell
2010-08-23Merge remote branch 'battery/master'Stephen Rothwell
2010-08-23Merge remote branch 'pcmcia/master'Stephen Rothwell
2010-08-23Merge remote branch 'input/next'Stephen Rothwell
2010-08-23Merge remote branch 'cpufreq/next'Stephen Rothwell
2010-08-23Merge remote branch 'sound/for-next'Stephen Rothwell
2010-08-23Merge remote branch 'sound-asoc/for-next'Stephen Rothwell
Conflicts: arch/arm/mach-s3c64xx/mach-smdk6410.c
2010-08-23Merge remote branch 'crypto/master'Stephen Rothwell
2010-08-23Merge remote branch 'wireless/master'Stephen Rothwell
Conflicts: drivers/net/wireless/libertas/if_sdio.c
2010-08-23Merge remote branch 'net/master'Stephen Rothwell
2010-08-23Merge remote branch 'async_tx/next'Stephen Rothwell
2010-08-23Merge remote branch 'ieee1394/for-next'Stephen Rothwell
2010-08-23Merge remote branch 'infiniband/for-next'Stephen Rothwell
2010-08-23Merge remote branch 'libata/NEXT'Stephen Rothwell
2010-08-23Merge remote branch 'kconfig/for-next'Stephen Rothwell
2010-08-23Merge remote branch 'kbuild/for-next'Stephen Rothwell
2010-08-23Merge remote branch 'v4l-dvb/master'Stephen Rothwell
2010-08-23Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2010-08-23Merge remote branch 'hid/for-next'Stephen Rothwell
2010-08-23Merge remote branch 'pci/linux-next'Stephen Rothwell
2010-08-23Merge remote branch 'ocfs2/linux-next'Stephen Rothwell
2010-08-23Merge remote branch 'nilfs2/for-next'Stephen Rothwell
2010-08-23Merge remote branch 'logfs/master'Stephen Rothwell
Conflicts: fs/logfs/logfs.h
2010-08-23Merge remote branch 'gfs2/master'Stephen Rothwell
2010-08-23Merge remote branch 'ext3/for_next'Stephen Rothwell
2010-08-23Merge remote branch 'ecryptfs/next'Stephen Rothwell
2010-08-23Merge remote branch 'cifs/master'Stephen Rothwell
2010-08-23Merge remote branch 'ceph/for-next'Stephen Rothwell
Conflicts: net/Makefile
2010-08-23Merge remote branch 'xtensa/master'Stephen Rothwell
Conflicts: arch/xtensa/configs/iss_defconfig