]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
12 years agoMerge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Thu, 6 Oct 2011 03:37:00 +0000 (14:37 +1100)]
Merge remote-tracking branch 'devicetree/devicetree/next'

12 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Thu, 6 Oct 2011 03:35:39 +0000 (14:35 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'

12 years agoMerge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Thu, 6 Oct 2011 03:34:20 +0000 (14:34 +1100)]
Merge remote-tracking branch 'edac/linux_next'

Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c

12 years agoMerge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Thu, 6 Oct 2011 03:31:23 +0000 (14:31 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'

12 years agoMerge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Thu, 6 Oct 2011 03:29:58 +0000 (14:29 +1100)]
Merge remote-tracking branch 'apm/for-next'

12 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Thu, 6 Oct 2011 03:23:28 +0000 (14:23 +1100)]
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c

12 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Thu, 6 Oct 2011 03:19:11 +0000 (14:19 +1100)]
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
Documentation/PCI/pci.txt
arch/arm/mach-nuc93x/time.c
drivers/net/Kconfig

12 years agoMerge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Thu, 6 Oct 2011 03:15:21 +0000 (14:15 +1100)]
Merge remote-tracking branch 'osd/linux-next'

12 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Thu, 6 Oct 2011 03:09:23 +0000 (14:09 +1100)]
Merge remote-tracking branch 'iommu/next'

12 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Thu, 6 Oct 2011 03:09:11 +0000 (14:09 +1100)]
Merge remote-tracking branch 'watchdog/master'

12 years agoMerge remote-tracking branch 'agp/agp-next'
Stephen Rothwell [Thu, 6 Oct 2011 03:08:31 +0000 (14:08 +1100)]
Merge remote-tracking branch 'agp/agp-next'

12 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Thu, 6 Oct 2011 03:01:49 +0000 (14:01 +1100)]
Merge remote-tracking branch 'security/next'

Conflicts:
fs/ocfs2/xattr.c

12 years agoMerge remote-tracking branch 'voltage/for-next'
Stephen Rothwell [Thu, 6 Oct 2011 03:00:23 +0000 (14:00 +1100)]
Merge remote-tracking branch 'voltage/for-next'

12 years agoMerge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Thu, 6 Oct 2011 02:59:02 +0000 (13:59 +1100)]
Merge remote-tracking branch 'omap_dss2/for-next'

Conflicts:
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-rx51.c
drivers/video/omap/lcd_apollon.c
drivers/video/omap/lcd_ldp.c
drivers/video/omap/lcd_overo.c

12 years agoMerge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Thu, 6 Oct 2011 02:49:49 +0000 (13:49 +1100)]
Merge remote-tracking branch 'fbdev/fbdev-next'

Conflicts:
drivers/video/Kconfig

12 years agoMerge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Thu, 6 Oct 2011 02:48:19 +0000 (13:48 +1100)]
Merge remote-tracking branch 'mfd/for-next'

Conflicts:
arch/arm/mach-u300/include/mach/irqs.h

12 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Thu, 6 Oct 2011 02:46:52 +0000 (13:46 +1100)]
Merge remote-tracking branch 'md/for-next'

12 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Thu, 6 Oct 2011 02:40:16 +0000 (13:40 +1100)]
Merge remote-tracking branch 'slab/for-next'

12 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 6 Oct 2011 02:40:06 +0000 (13:40 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'

12 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Thu, 6 Oct 2011 02:38:44 +0000 (13:38 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'

Conflicts:
drivers/mmc/core/core.c
drivers/mmc/core/sd.c

12 years agoMerge remote-tracking branch 'leds/for-mm'
Stephen Rothwell [Thu, 6 Oct 2011 02:38:33 +0000 (13:38 +1100)]
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig

12 years agoMerge remote-tracking branch 'battery/master'
Stephen Rothwell [Thu, 6 Oct 2011 02:36:45 +0000 (13:36 +1100)]
Merge remote-tracking branch 'battery/master'

12 years agoMerge branch 'quilt/device-mapper'
Stephen Rothwell [Thu, 6 Oct 2011 02:35:09 +0000 (13:35 +1100)]
Merge branch 'quilt/device-mapper'

12 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Thu, 6 Oct 2011 02:32:58 +0000 (13:32 +1100)]
Merge remote-tracking branch 'block/for-next'

12 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 6 Oct 2011 02:31:08 +0000 (13:31 +1100)]
Merge remote-tracking branch 'input/next'

12 years agoMerge branch 'quilt/rr'
Stephen Rothwell [Thu, 6 Oct 2011 02:29:47 +0000 (13:29 +1100)]
Merge branch 'quilt/rr'

12 years agoMerge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Thu, 6 Oct 2011 02:28:28 +0000 (13:28 +1100)]
Merge remote-tracking branch 'cpufreq/next'

12 years agoMerge commit 'refs/next/20111005/sound-asoc'
Stephen Rothwell [Thu, 6 Oct 2011 02:21:53 +0000 (13:21 +1100)]
Merge commit 'refs/next/20111005/sound-asoc'

12 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Thu, 6 Oct 2011 02:15:03 +0000 (13:15 +1100)]
Merge remote-tracking branch 'sound/for-next'

Conflicts:
arch/mips/alchemy/devboards/db1x00/platform.c
sound/mips/Kconfig

12 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Thu, 6 Oct 2011 02:09:23 +0000 (13:09 +1100)]
Merge remote-tracking branch 'crypto/master'

12 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 6 Oct 2011 02:08:01 +0000 (13:08 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

Conflicts:
arch/arm/mach-at91/board-afeb-9260v1.c
arch/arm/mach-at91/board-neocore926.c
arch/arm/mach-at91/board-rm9200dk.c
arch/arm/mach-at91/board-sam9g20ek.c
arch/arm/mach-at91/board-sam9m10g45ek.c
arch/arm/mach-at91/board-usb-a9260.c

12 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 6 Oct 2011 02:07:25 +0000 (13:07 +1100)]
Merge remote-tracking branch 'bluetooth/master'

Conflicts:
net/bluetooth/hci_core.c
net/bluetooth/l2cap_core.c
net/bluetooth/mgmt.c
net/bluetooth/smp.c

12 years agoMerge remote-tracking branch 'wireless/master'
Stephen Rothwell [Thu, 6 Oct 2011 01:58:39 +0000 (12:58 +1100)]
Merge remote-tracking branch 'wireless/master'

Conflicts:
Documentation/feature-removal-schedule.txt

12 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Thu, 6 Oct 2011 01:51:49 +0000 (12:51 +1100)]
Merge remote-tracking branch 'net/master'

Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
drivers/s390/cio/qdio_main.c
net/batman-adv/soft-interface.c

12 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 6 Oct 2011 01:25:10 +0000 (12:25 +1100)]
Merge remote-tracking branch 'slave-dma/next'

12 years agoMerge remote-tracking branch 'scsi/master'
Stephen Rothwell [Thu, 6 Oct 2011 01:23:00 +0000 (12:23 +1100)]
Merge remote-tracking branch 'scsi/master'

12 years agoMerge remote-tracking branch 'ibft/master'
Stephen Rothwell [Thu, 6 Oct 2011 01:22:56 +0000 (12:22 +1100)]
Merge remote-tracking branch 'ibft/master'

12 years agoMerge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Thu, 6 Oct 2011 01:22:50 +0000 (12:22 +1100)]
Merge remote-tracking branch 'swiotlb/master'

12 years agoMerge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Thu, 6 Oct 2011 01:21:32 +0000 (12:21 +1100)]
Merge remote-tracking branch 'ieee1394/for-next'

12 years agoMerge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Thu, 6 Oct 2011 01:20:07 +0000 (12:20 +1100)]
Merge remote-tracking branch 'infiniband/for-next'

12 years agoMerge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Thu, 6 Oct 2011 01:18:48 +0000 (12:18 +1100)]
Merge remote-tracking branch 'libata/NEXT'

12 years agoMerge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Thu, 6 Oct 2011 01:18:43 +0000 (12:18 +1100)]
Merge remote-tracking branch 'kconfig/for-next'

12 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 6 Oct 2011 01:17:16 +0000 (12:17 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

12 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Thu, 6 Oct 2011 01:15:30 +0000 (12:15 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

12 years agoMerge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Thu, 6 Oct 2011 01:14:11 +0000 (12:14 +1100)]
Merge remote-tracking branch 'docs/docs-move'

12 years agoMerge branch 'quilt/kernel-doc'
Stephen Rothwell [Thu, 6 Oct 2011 01:12:58 +0000 (12:12 +1100)]
Merge branch 'quilt/kernel-doc'

12 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Thu, 6 Oct 2011 01:11:39 +0000 (12:11 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

12 years agoMerge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Thu, 6 Oct 2011 01:10:27 +0000 (12:10 +1100)]
Merge branch 'quilt/jdelvare-hwmon'

12 years agoMerge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Thu, 6 Oct 2011 01:09:07 +0000 (12:09 +1100)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

12 years agoMerge branch 'quilt/i2c'
Stephen Rothwell [Thu, 6 Oct 2011 01:07:53 +0000 (12:07 +1100)]
Merge branch 'quilt/i2c'

12 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 6 Oct 2011 01:06:29 +0000 (12:06 +1100)]
Merge remote-tracking branch 'hid/for-next'

12 years agoMerge remote-tracking branch 'xfs/master'
Stephen Rothwell [Thu, 6 Oct 2011 01:05:08 +0000 (12:05 +1100)]
Merge remote-tracking branch 'xfs/master'

Conflicts:
fs/xfs/xfs_aops.c
fs/xfs/xfs_super.c

12 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Thu, 6 Oct 2011 01:00:03 +0000 (12:00 +1100)]
Merge remote-tracking branch 'v9fs/for-next'

12 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Thu, 6 Oct 2011 00:58:37 +0000 (11:58 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'

12 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Thu, 6 Oct 2011 00:52:33 +0000 (11:52 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'

12 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Thu, 6 Oct 2011 00:51:18 +0000 (11:51 +1100)]
Merge remote-tracking branch 'logfs/master'

12 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Thu, 6 Oct 2011 00:50:02 +0000 (11:50 +1100)]
Merge remote-tracking branch 'gfs2/master'

12 years agoMerge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Thu, 6 Oct 2011 00:48:36 +0000 (11:48 +1100)]
Merge remote-tracking branch 'ceph/for-next'

12 years agoMerge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Thu, 6 Oct 2011 00:47:24 +0000 (11:47 +1100)]
Merge remote-tracking branch 'xtensa/master'

12 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Thu, 6 Oct 2011 00:46:10 +0000 (11:46 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'

12 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Thu, 6 Oct 2011 00:44:57 +0000 (11:44 +1100)]
Merge remote-tracking branch 'tile/master'

12 years agoMerge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Thu, 6 Oct 2011 00:43:43 +0000 (11:43 +1100)]
Merge remote-tracking branch 'rmobile/rmobile-latest'

12 years agoMerge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Thu, 6 Oct 2011 00:42:31 +0000 (11:42 +1100)]
Merge remote-tracking branch 'sh/sh-latest'

12 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Thu, 6 Oct 2011 00:36:04 +0000 (11:36 +1100)]
Merge remote-tracking branch 's390/features'

12 years agoMerge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Thu, 6 Oct 2011 00:34:46 +0000 (11:34 +1100)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'

12 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Thu, 6 Oct 2011 00:28:19 +0000 (11:28 +1100)]
Merge remote-tracking branch 'powerpc/next'

12 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Thu, 6 Oct 2011 00:26:58 +0000 (11:26 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

12 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Thu, 6 Oct 2011 00:25:40 +0000 (11:25 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

12 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Thu, 6 Oct 2011 00:24:28 +0000 (11:24 +1100)]
Merge remote-tracking branch 'm68k/for-next'

12 years agoMerge remote-tracking branch 'ia64/test'
Stephen Rothwell [Thu, 6 Oct 2011 00:23:16 +0000 (11:23 +1100)]
Merge remote-tracking branch 'ia64/test'

12 years agoMerge branch 'quilt/hexagon'
Stephen Rothwell [Thu, 6 Oct 2011 00:21:59 +0000 (11:21 +1100)]
Merge branch 'quilt/hexagon'

12 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Thu, 6 Oct 2011 00:20:41 +0000 (11:20 +1100)]
Merge remote-tracking branch 'cris/for-next'

12 years agoMerge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Thu, 6 Oct 2011 00:19:29 +0000 (11:19 +1100)]
Merge remote-tracking branch 'blackfin/for-linus'

12 years agoMerge remote-tracking branch 's5p/for-next'
Stephen Rothwell [Thu, 6 Oct 2011 00:16:07 +0000 (11:16 +1100)]
Merge remote-tracking branch 's5p/for-next'

Conflicts:
drivers/gpio/Makefile

12 years agoMerge remote-tracking branch 'i.MX/for-next'
Stephen Rothwell [Thu, 6 Oct 2011 00:14:44 +0000 (11:14 +1100)]
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-imx/Makefile

12 years agoMerge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Thu, 6 Oct 2011 00:13:27 +0000 (11:13 +1100)]
Merge remote-tracking branch 'at91/at91-next'

12 years agoMerge commit 'refs/next/20110930/arm-soc'
Stephen Rothwell [Thu, 6 Oct 2011 00:11:14 +0000 (11:11 +1100)]
Merge commit 'refs/next/20110930/arm-soc'

Conflicts:
Documentation/devicetree/bindings/arm/l2cc.txt
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-nuc93x/Makefile.boot
arch/arm/mach-tegra/board-paz00.h
arch/arm/mach-tegra/board-seaboard.h
arch/arm/mach-u300/Makefile.boot
arch/arm/mm/cache-l2x0.c
arch/arm/plat-mxc/include/mach/gpio.h

12 years agoMerge remote-tracking branch 'arm-lpae/for-next'
Stephen Rothwell [Wed, 5 Oct 2011 23:53:44 +0000 (10:53 +1100)]
Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/page.h
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable-hwdef.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h
arch/arm/kernel/head.S
arch/arm/kernel/sleep.S
arch/arm/mm/dma-mapping.c
arch/arm/mm/mmu.c

12 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Wed, 5 Oct 2011 23:52:27 +0000 (10:52 +1100)]
Merge remote-tracking branch 'arm/for-next'

12 years agoMerge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Wed, 5 Oct 2011 23:51:02 +0000 (10:51 +1100)]
Merge remote-tracking branch 'pci-current/for-linus'

12 years agoMerge remote-tracking branch 'net-current/master'
Stephen Rothwell [Wed, 5 Oct 2011 23:51:01 +0000 (10:51 +1100)]
Merge remote-tracking branch 'net-current/master'

12 years agoMerge remote-tracking branch 'arm-current/fixes'
Stephen Rothwell [Wed, 5 Oct 2011 23:50:59 +0000 (10:50 +1100)]
Merge remote-tracking branch 'arm-current/fixes'

12 years agobnx2x: remove some dead code
Dan Carpenter [Wed, 5 Oct 2011 21:52:28 +0000 (17:52 -0400)]
bnx2x: remove some dead code

This code is after the break statement so it never gets used.  The
"vlan_mac_obj" variable does get initialized properly, so we can just
delete this.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agonetfilter: Use proper rwlock init function
Thomas Gleixner [Wed, 5 Oct 2011 03:24:43 +0000 (03:24 +0000)]
netfilter: Use proper rwlock init function

Replace the open coded initialization with the init function.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agochelsio: convert to SKB paged frag API.
Ian Campbell [Wed, 5 Oct 2011 00:28:52 +0000 (00:28 +0000)]
chelsio: convert to SKB paged frag API.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Divy Le Ray <divy@chelsio.com>
Cc: Dimitris Michailidis <dm@chelsio.com>
Cc: Casey Leedom <leedom@chelsio.com>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agocxgb3: convert to SKB paged frag API.
Ian Campbell [Wed, 5 Oct 2011 00:28:51 +0000 (00:28 +0000)]
cxgb3: convert to SKB paged frag API.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Divy Le Ray <divy@chelsio.com>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agomyri10ge: convert to SKB paged frag API.
Ian Campbell [Wed, 5 Oct 2011 00:28:50 +0000 (00:28 +0000)]
myri10ge: convert to SKB paged frag API.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Jon Mason <mason@myri.com>
Cc: Andrew Gallatin <gallatin@myri.com>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agohv: netvsc: convert to SKB paged frag API.
Ian Campbell [Wed, 5 Oct 2011 00:28:49 +0000 (00:28 +0000)]
hv: netvsc: convert to SKB paged frag API.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Cc: Abhishek Kane <v-abkane@microsoft.com>
Cc: devel@driverdev.osuosl.org
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agoet131x: convert to SKB paged frag API.
Ian Campbell [Wed, 5 Oct 2011 00:28:48 +0000 (00:28 +0000)]
et131x: convert to SKB paged frag API.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Mark Einon <mark.einon@gmail.com>
Cc: devel@driverdev.osuosl.org
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agoxen: netfront: convert to SKB paged frag API.
Ian Campbell [Wed, 5 Oct 2011 00:28:47 +0000 (00:28 +0000)]
xen: netfront: convert to SKB paged frag API.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: xen-devel@lists.xensource.com
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agoxen: netback: convert to SKB paged frag API.
Ian Campbell [Wed, 5 Oct 2011 00:28:46 +0000 (00:28 +0000)]
xen: netback: convert to SKB paged frag API.

netback currently uses frag->page to store a temporary index reference while
processing incoming requests. Since frag->page is to become opaque switch
instead to using page_offset. Add a wrapper to tidy this up and propagate the
fact that the indexes are only u16 through the code (this was already true in
practice but unsigned long and in were inconsistently used as variable and
parameter types)

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: xen-devel@lists.xensource.com
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agovxge: convert to SKB paged frag API.
Ian Campbell [Wed, 5 Oct 2011 21:35:34 +0000 (17:35 -0400)]
vxge: convert to SKB paged frag API.

[ Use DMA_TO_DEVICE and dma_mapping_error() -DaveM ]

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Jon Mason <jdmason@kudzu.us>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agoPM / ACPI: Blacklist Vaio VGN-FW520F machine known to require acpi_sleep=nonvs
Bogdan Radulescu [Wed, 5 Oct 2011 20:40:21 +0000 (22:40 +0200)]
PM / ACPI: Blacklist Vaio VGN-FW520F machine known to require acpi_sleep=nonvs

Sony Vaio VGN-FW520F does not resume correctly without
acpi_sleep=nonvs, so add it to the ACPI sleep blacklist.

References: https://bugzilla.kernel.org/show_bug.cgi?id=16396#c86
Signed-off-by: Bogdan Radulescu <bogdan@nimblex.net>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
12 years agoPM / ACPI: Blacklist Sony Vaio known to require acpi_sleep=nonvs
Rafael J. Wysocki [Wed, 5 Oct 2011 20:40:02 +0000 (22:40 +0200)]
PM / ACPI: Blacklist Sony Vaio known to require acpi_sleep=nonvs

Apparently, Sony Vaio VGN-SR26GN_P does not resume correctly without
acpi_sleep=nonvs, so add it to the ACPI sleep blacklist.

References: https://bugzilla.kernel.org/show_bug.cgi?id=16396#c91
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
12 years agoPM / Hibernate: Add resumewait param to support MMC-like devices as resume file
Barry Song [Wed, 5 Oct 2011 20:39:45 +0000 (22:39 +0200)]
PM / Hibernate: Add resumewait param to support MMC-like devices as resume file

Some devices like MMC are async detected very slow. For example,
drivers/mmc/host/sdhci.c launches a 200ms delayed work to detect
MMC partitions then add disk.

We have wait_for_device_probe() and scsi_complete_async_scans()
before calling swsusp_check(), but it is not enough to wait for MMC.

This patch adds resumewait kernel param just like rootwait so
that we have enough time to wait until MMC is ready. The difference is
that we wait for resume partition whereas rootwait waits for rootfs
partition (which may be on a different device).

This patch will make hibernation support many embedded products
without SCSI devices, but with devices like MMC.

[rjw: Modified the changelog slightly.]

Signed-off-by: Barry Song <Baohua.Song@csr.com>
Reviewed-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
12 years agodevicetree: fix build error on drivers/tty/serial/altera_jtaguart.c
Grant Likely [Wed, 5 Oct 2011 17:18:40 +0000 (11:18 -0600)]
devicetree: fix build error on drivers/tty/serial/altera_jtaguart.c

This patch fixes the following build error caused by commit
85888069cf5d ("tty: use of_match_ptr() for of_match_table entry").
The problem was a missing #include <linux/of.h> which is where
of_match_ptr() is defined.

drivers/tty/serial/altera_jtaguart.c:483:3: error: implicit declaration of function 'of_match_ptr' [-Werror=implicit-function-declaration]
drivers/tty/serial/altera_jtaguart.c:483:34: error: 'altera_jtaguart_match' undeclared here (not in a function)

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Tobias Klauser <tklauser@distanz.ch> (maintainer:ALTERA UART/JTAG...)
Cc: Alan Cox <alan@linux.intel.com> (maintainer:SERIAL DRIVERS)
12 years agoMerge branch 'for-grant' of git://git.jdl.com/software/linux-3.0 into devicetree...
Grant Likely [Wed, 5 Oct 2011 16:52:27 +0000 (10:52 -0600)]
Merge branch 'for-grant' of git://git.jdl.com/software/linux-3.0 into devicetree/next

12 years agoMerge branch 'for-linus' of git://github.com/dtor/input
Linus Torvalds [Wed, 5 Oct 2011 16:22:38 +0000 (09:22 -0700)]
Merge branch 'for-linus' of git://github.com/dtor/input

* 'for-linus' of git://github.com/dtor/input:
  Input: wacom - revert "Cintiq 21UX2 does not have menu strips"

12 years agoMerge git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6
Linus Torvalds [Wed, 5 Oct 2011 16:16:11 +0000 (09:16 -0700)]
Merge git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6

* git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6:
  [SCSI] libsas: fix panic when single phy is disabled on a wide port
  [SCSI] qla2xxx: Fix crash in qla2x00_abort_all_cmds() on unload

12 years agoMerge branch 'upstream' into for-next
Jiri Kosina [Wed, 5 Oct 2011 14:55:55 +0000 (16:55 +0200)]
Merge branch 'upstream' into for-next