summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2009-11-18net: using csum_ipv6_magic requires including net/ip6_checksum.hStephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2009-11-18Merge branch 'quilt/staging'Stephen Rothwell
Conflicts: drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/comedi/drivers/cb_das16_cs.c drivers/staging/comedi/drivers/ni_labpc_cs.c drivers/staging/comedi/drivers/ni_mio_cs.c
2009-11-18Merge branch 'quilt/usb'Stephen Rothwell
2009-11-18Merge branch 'quilt/tty'Stephen Rothwell
2009-11-18Merge branch 'quilt/driver-core'Stephen Rothwell
2009-11-18Merge remote branch 'sysctl/master'Stephen Rothwell
Conflicts: net/ipv6/addrconf.c
2009-11-18Merge remote branch 'percpu/for-next'Stephen Rothwell
Conflicts: arch/powerpc/platforms/pseries/hvCall.S arch/x86/kvm/svm.c kernel/softlockup.c
2009-11-18Merge remote branch 'edac-amd/for-next'Stephen Rothwell
2009-11-18Merge remote branch 'tip/auto-latest'Stephen Rothwell
Conflicts: arch/x86/kernel/kgdb.c kernel/irq/chip.c
2009-11-18Merge remote branch 'omap_dss2/for-next'Stephen Rothwell
2009-11-18Merge remote branch 'devicetree/next-devicetree'Stephen Rothwell
2009-11-18Merge remote branch 'i7core_edac/linux_next'Stephen Rothwell
2009-11-18Merge remote branch 'alacrity/linux-next'Stephen Rothwell
Conflicts: drivers/net/Kconfig include/linux/Kbuild lib/Kconfig
2009-11-18Merge remote branch 'hwlat/for-linus'Stephen Rothwell
Conflicts: drivers/misc/Makefile
2009-11-18Merge remote branch 'irda/for-next'Stephen Rothwell
2009-11-18Merge remote branch 'suspend/linux-next'Stephen Rothwell
2009-11-18Merge branch 'quilt/aoe'Stephen Rothwell
2009-11-18Merge remote branch 'trivial/for-next'Stephen Rothwell
2009-11-18Merge remote branch 'osd/linux-next'Stephen Rothwell
2009-11-18Merge remote branch 'dwmw2-iommu/master'Stephen Rothwell
2009-11-18Merge remote branch 'watchdog/master'Stephen Rothwell
2009-11-18Merge remote branch 'security-testing/next'Stephen Rothwell
Conflicts: Documentation/dontdiff
2009-11-18Merge remote branch 'voltage/for-next'Stephen Rothwell
Conflicts: drivers/mfd/Kconfig drivers/mfd/Makefile
2009-11-18Merge remote branch 'drm/drm-next'Stephen Rothwell
2009-11-18Merge remote branch 'mfd/for-next'Stephen Rothwell
2009-11-18Merge remote branch 'md/for-next'Stephen Rothwell
2009-11-18Merge remote branch 'backlight/for-mm'Stephen Rothwell
2009-11-18Merge remote branch 'leds/for-mm'Stephen Rothwell
2009-11-18Merge remote branch 'battery/master'Stephen Rothwell
2009-11-18Merge remote branch 'pcmcia/master'Stephen Rothwell
Conflicts: drivers/mtd/maps/pcmciamtd.c drivers/net/wireless/ray_cs.c drivers/pcmcia/Makefile
2009-11-18Merge branch 'quilt/device-mapper'Stephen Rothwell
2009-11-18Merge remote branch 'block/for-next'Stephen Rothwell
2009-11-18Merge remote branch 'input/next'Stephen Rothwell
2009-11-18Merge remote branch 'tmio-mmc/linux-next'Stephen Rothwell
2009-11-18Merge branch 'quilt/rr'Stephen Rothwell
2009-11-18Merge remote branch 'cpufreq/next'Stephen Rothwell
Conflicts: include/acpi/processor.h
2009-11-18Merge remote branch 'mtd/master'Stephen Rothwell
2009-11-18Merge remote branch 'wireless/master'Stephen Rothwell
2009-11-18Merge remote branch 'net/master'Stephen Rothwell
Conflicts: drivers/net/sfc/sfe4001.c drivers/net/wireless/libertas/cmd.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/rtl8187se/Kconfig drivers/staging/rtl8192e/Kconfig
2009-11-18Merge remote branch 'scsi/master'Stephen Rothwell
2009-11-18Merge remote branch 'ubi/linux-next'Stephen Rothwell
2009-11-18Merge remote branch 'ieee1394/for-next'Stephen Rothwell
2009-11-18Merge remote branch 'acpi/test'Stephen Rothwell
2009-11-18Merge remote branch 'infiniband/for-next'Stephen Rothwell
2009-11-18Merge remote branch 'libata/NEXT'Stephen Rothwell
2009-11-18Merge remote branch 'ide/master'Stephen Rothwell
2009-11-18Merge remote branch 'kbuild/master'Stephen Rothwell
2009-11-18Merge remote branch 'v4l-dvb/master'Stephen Rothwell
Conflicts: drivers/media/common/tuners/tda18271-fe.c
2009-11-17mtd: Fix comment in KconfigKrzysztof Halasa
IXDP425 and Coyote aren't based on IXP2000 but on IXP425. Signed-off-by: Krzysztof Halasa <khc@pm.waw.pl> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2009-11-17tree-wide: fix assorted typos all over the placeAndré Goddard Rosa
That is "success", "unknown", "through", "performance", "[re|un]mapping" , "access", "default", "reasonable", "[con]currently", "temperature" , "channel", "[un]used", "application", "example","hierarchy", "therefore" , "[over|under]flow", "contiguous", "threshold", "enough" and others. Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>