]>
git.kernelconcepts.de Git - karo-tx-linux.git/log
Stephen Rothwell [Tue, 13 Dec 2011 05:42:53 +0000 (16:42 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Tue, 13 Dec 2011 05:40:53 +0000 (16:40 +1100)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile
Stephen Rothwell [Tue, 13 Dec 2011 05:34:41 +0000 (16:34 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Tue, 13 Dec 2011 05:33:07 +0000 (16:33 +1100)]
Merge remote-tracking branch 'hsi/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 05:31:33 +0000 (16:31 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 05:29:53 +0000 (16:29 +1100)]
Merge remote-tracking branch 'namespace/master'
Stephen Rothwell [Tue, 13 Dec 2011 05:28:16 +0000 (16:28 +1100)]
Merge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Tue, 13 Dec 2011 05:22:03 +0000 (16:22 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'
Conflicts:
arch/x86/xen/Kconfig
Stephen Rothwell [Tue, 13 Dec 2011 05:20:32 +0000 (16:20 +1100)]
Merge remote-tracking branch 'xen/upstream/xen'
Conflicts:
arch/x86/xen/Kconfig
Stephen Rothwell [Tue, 13 Dec 2011 05:18:50 +0000 (16:18 +1100)]
Merge remote-tracking branch 'oprofile/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 05:12:21 +0000 (16:12 +1100)]
Merge remote-tracking branch 'kmemleak/kmemleak'
Stephen Rothwell [Tue, 13 Dec 2011 05:05:27 +0000 (16:05 +1100)]
Merge remote-tracking branch 'uprobes/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:58:32 +0000 (15:58 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
drivers/cpufreq/cpufreq_conservative.c
drivers/cpufreq/cpufreq_ondemand.c
drivers/macintosh/rack-meter.c
fs/proc/stat.c
fs/proc/uptime.c
kernel/sched/core.c
Stephen Rothwell [Tue, 13 Dec 2011 04:56:00 +0000 (15:56 +1100)]
Merge remote-tracking branch 'gpio/gpio/next'
Stephen Rothwell [Tue, 13 Dec 2011 04:54:27 +0000 (15:54 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:51:20 +0000 (15:51 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:49:45 +0000 (15:49 +1100)]
Merge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:42:55 +0000 (15:42 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:35:59 +0000 (15:35 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
arch/powerpc/platforms/40x/Kconfig
Stephen Rothwell [Tue, 13 Dec 2011 04:35:49 +0000 (15:35 +1100)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:29:27 +0000 (15:29 +1100)]
Merge remote-tracking branch 'cputime/cputime'
Stephen Rothwell [Tue, 13 Dec 2011 04:27:55 +0000 (15:27 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Tue, 13 Dec 2011 04:26:19 +0000 (15:26 +1100)]
Merge remote-tracking branch 'watchdog/linux-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:23:33 +0000 (15:23 +1100)]
Merge remote-tracking branch 'security/next'
Conflicts:
lib/Makefile
Stephen Rothwell [Tue, 13 Dec 2011 04:22:02 +0000 (15:22 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:20:28 +0000 (15:20 +1100)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:15:40 +0000 (15:15 +1100)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/nouveau/nouveau_sgdma.c
Stephen Rothwell [Tue, 13 Dec 2011 04:11:27 +0000 (15:11 +1100)]
Merge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:09:58 +0000 (15:09 +1100)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:08:24 +0000 (15:08 +1100)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:08:14 +0000 (15:08 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:06:42 +0000 (15:06 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:05:09 +0000 (15:05 +1100)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Tue, 13 Dec 2011 04:02:39 +0000 (15:02 +1100)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 04:01:03 +0000 (15:01 +1100)]
Merge remote-tracking branch 'input/next'
Conflicts:
drivers/input/keyboard/samsung-keypad.c
Stephen Rothwell [Tue, 13 Dec 2011 03:59:33 +0000 (14:59 +1100)]
Merge branch 'quilt/rr'
Stephen Rothwell [Tue, 13 Dec 2011 03:58:04 +0000 (14:58 +1100)]
Merge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Tue, 13 Dec 2011 03:56:28 +0000 (14:56 +1100)]
Merge commit 'refs/next/
20111212 /sound-asoc'
Stephen Rothwell [Tue, 13 Dec 2011 03:48:07 +0000 (14:48 +1100)]
Merge remote-tracking branch 'sound/for-next'
Conflicts:
arch/arm/mach-s3c64xx/mach-crag6410.c
Stephen Rothwell [Tue, 13 Dec 2011 03:46:35 +0000 (14:46 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Tue, 13 Dec 2011 03:45:01 +0000 (14:45 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Conflicts:
drivers/mtd/bcm63xxpart.c
Stephen Rothwell [Tue, 13 Dec 2011 03:43:33 +0000 (14:43 +1100)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Tue, 13 Dec 2011 03:37:26 +0000 (14:37 +1100)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
drivers/net/ethernet/freescale/fsl_pq_mdio.c
Stephen Rothwell [Tue, 13 Dec 2011 03:33:44 +0000 (14:33 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Conflicts:
drivers/dma/pl330.c
Stephen Rothwell [Tue, 13 Dec 2011 03:32:08 +0000 (14:32 +1100)]
Merge remote-tracking branch 'target-merge/for-next-merge'
Stephen Rothwell [Tue, 13 Dec 2011 03:30:19 +0000 (14:30 +1100)]
Merge remote-tracking branch 'scsi/master'
Stephen Rothwell [Tue, 13 Dec 2011 03:28:45 +0000 (14:28 +1100)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Tue, 13 Dec 2011 03:27:19 +0000 (14:27 +1100)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Tue, 13 Dec 2011 03:25:17 +0000 (14:25 +1100)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Tue, 13 Dec 2011 03:25:14 +0000 (14:25 +1100)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 03:23:44 +0000 (14:23 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 03:20:20 +0000 (14:20 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
drivers/staging/media/as102/as102_drv.h
Stephen Rothwell [Tue, 13 Dec 2011 03:18:53 +0000 (14:18 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Tue, 13 Dec 2011 03:17:30 +0000 (14:17 +1100)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Tue, 13 Dec 2011 01:41:20 +0000 (12:41 +1100)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Conflicts:
drivers/i2c/busses/i2c-designware-platdrv.c
Stephen Rothwell [Tue, 13 Dec 2011 01:39:50 +0000 (12:39 +1100)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Tue, 13 Dec 2011 01:38:17 +0000 (12:38 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 01:32:16 +0000 (12:32 +1100)]
Merge remote-tracking branch 'pci/linux-next'
Stephen Rothwell [Tue, 13 Dec 2011 01:30:48 +0000 (12:30 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Tue, 13 Dec 2011 01:29:15 +0000 (12:29 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Tue, 13 Dec 2011 01:27:52 +0000 (12:27 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Tue, 13 Dec 2011 01:26:27 +0000 (12:26 +1100)]
Merge remote-tracking branch 'logfs/master'
Conflicts:
fs/logfs/file.c
Stephen Rothwell [Tue, 13 Dec 2011 01:24:50 +0000 (12:24 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 13 Dec 2011 01:23:25 +0000 (12:23 +1100)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 01:23:21 +0000 (12:23 +1100)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Tue, 13 Dec 2011 01:21:50 +0000 (12:21 +1100)]
Merge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Tue, 13 Dec 2011 01:20:20 +0000 (12:20 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Tue, 13 Dec 2011 01:20:03 +0000 (12:20 +1100)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Tue, 13 Dec 2011 01:17:41 +0000 (12:17 +1100)]
Merge remote-tracking branch '4xx/next'
Conflicts:
arch/powerpc/platforms/40x/ppc40x_simple.c
Stephen Rothwell [Tue, 13 Dec 2011 01:15:16 +0000 (12:15 +1100)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Tue, 13 Dec 2011 01:13:51 +0000 (12:13 +1100)]
Merge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 01:12:03 +0000 (12:12 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Conflicts:
arch/mips/kernel/perf_event_mipsxx.c
Stephen Rothwell [Tue, 13 Dec 2011 01:10:36 +0000 (12:10 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Conflicts:
arch/m68k/Kconfig.debug
Stephen Rothwell [Tue, 13 Dec 2011 01:09:14 +0000 (12:09 +1100)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 01:07:49 +0000 (12:07 +1100)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Tue, 13 Dec 2011 01:06:30 +0000 (12:06 +1100)]
Merge branch 'quilt/hexagon'
Stephen Rothwell [Tue, 13 Dec 2011 01:04:50 +0000 (12:04 +1100)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Tue, 13 Dec 2011 00:59:26 +0000 (11:59 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Tue, 13 Dec 2011 00:58:02 +0000 (11:58 +1100)]
Merge remote-tracking branch 'tegra/for-next'
Conflicts:
arch/arm/mach-tegra/board-dt.c
arch/arm/mach-tegra/include/mach/entry-macro.S
Stephen Rothwell [Tue, 13 Dec 2011 00:56:40 +0000 (11:56 +1100)]
Merge remote-tracking branch 's5p/for-next'
Conflicts:
arch/arm/mach-exynos/cpu.c
arch/arm/mach-exynos/include/mach/entry-macro.S
arch/arm/mach-s3c64xx/mach-crag6410.c
Stephen Rothwell [Tue, 13 Dec 2011 00:55:14 +0000 (11:55 +1100)]
Merge remote-tracking branch 'i.MX/for-next'
Conflicts:
arch/arm/mach-imx/clock-mx51-mx53.c
arch/arm/mach-imx/devices-imx53.h
arch/arm/mach-imx/mm-imx5.c
arch/arm/mach-mx5/Kconfig
arch/arm/mach-mx5/Makefile
arch/arm/mach-mx5/pm-imx5.c
arch/arm/plat-mxc/include/mach/hardware.h
Stephen Rothwell [Tue, 13 Dec 2011 00:43:27 +0000 (11:43 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-mxs/include/mach/common.h
Stephen Rothwell [Tue, 13 Dec 2011 00:37:35 +0000 (11:37 +1100)]
Merge remote-tracking branch 'arm/for-next'
Conflicts:
arch/arm/mach-mxs/mach-m28evk.c
arch/arm/mach-mxs/mach-stmp378x_devb.c
Stephen Rothwell [Tue, 13 Dec 2011 00:31:03 +0000 (11:31 +1100)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Tue, 13 Dec 2011 00:30:46 +0000 (11:30 +1100)]
Merge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Tue, 13 Dec 2011 00:30:44 +0000 (11:30 +1100)]
Merge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Tue, 13 Dec 2011 00:30:42 +0000 (11:30 +1100)]
Merge remote-tracking branch 'wireless/master'
Stephen Rothwell [Tue, 13 Dec 2011 00:30:41 +0000 (11:30 +1100)]
Merge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Tue, 13 Dec 2011 00:30:40 +0000 (11:30 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Tue, 13 Dec 2011 00:30:39 +0000 (11:30 +1100)]
Merge remote-tracking branch 'net/master'
Stephen Rothwell [Tue, 13 Dec 2011 00:30:39 +0000 (11:30 +1100)]
Merge remote-tracking branch 'scsi-rc-fixes/master'
Stephen Rothwell [Tue, 13 Dec 2011 00:30:38 +0000 (11:30 +1100)]
Merge remote-tracking branch 'sparc/master'
Stephen Rothwell [Tue, 13 Dec 2011 00:30:35 +0000 (11:30 +1100)]
Merge remote-tracking branch 'arm-current/fixes'
Laszlo Ersek [Sun, 11 Dec 2011 01:48:59 +0000 (01:48 +0000)]
xen-netfront: delay gARP until backend switches to Connected
After a guest is live migrated, the xen-netfront driver emits a gratuitous
ARP message, so that networking hardware on the target host's subnet can
take notice, and public routing to the guest is re-established. However,
if the packet appears on the backend interface before the backend is added
to the target host's bridge, the packet is lost, and the migrated guest's
peers become unable to talk to the guest.
A sufficient two-parts condition to prevent the above is:
(1) ensure that the backend only moves to Connected xenbus state after its
hotplug scripts completed, ie. the netback interface got added to the
bridge; and
(2) ensure the frontend only queues the gARP when it sees the backend move
to Connected.
These two together provide complete ordering. Sub-condition (1) is already
satisfied by commit
f942dc2552b8 in Linus' tree, based on commit
6b0b80ca7165 from [1].
In general, the full condition is sufficient, not necessary, because,
according to [2], live migration has been working for a long time without
satisfying sub-condition (2). However, after
6b0b80ca7165 was backported
to the RHEL-5 host to ensure (1), (2) still proved necessary in the RHEL-6
guest. This patch intends to provide (2) for upstream.
The Reviewed-by line comes from [3].
[1] git://xenbits.xen.org/people/ianc/linux-2.6.git#upstream/dom0/backend/netback-history
[2] http://old-list-archives.xen.org/xen-devel/2011-06/msg01969.html
[3] http://old-list-archives.xen.org/xen-devel/2011-07/msg00484.html
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Greg Kroah-Hartman [Mon, 12 Dec 2011 23:51:41 +0000 (15:51 -0800)]
Merge branch 'for-next/musb' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
* 'for-next/musb' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb:
usb: musb: omap2430: fix compile warning
usb: musb: fix pm_runtime calls while atomic
usb: musb: drop ARCH dependency
usb: musb: headers cleanup
usb: musb: allow building USB_MUSB_TUSB6010 as a module
usb: musb: use a Kconfig choice to pick the right DMA method
usb: musb: omap2+: save and restore OTG_INTERFSEL
usb: musb: omap2+: fix context api's
usb: musb: ux500: optimize DMA callback routine
Ted Feng [Thu, 8 Dec 2011 00:46:21 +0000 (00:46 +0000)]
ipip, sit: copy parms.name after register_netdevice
Same fix as
731abb9cb2 for ipip and sit tunnel.
Commit
1c5cae815d removed an explicit call to dev_alloc_name in
ipip_tunnel_locate and ipip6_tunnel_locate, because register_netdevice
will now create a valid name, however the tunnel keeps a copy of the
name in the private parms structure. Fix this by copying the name back
after register_netdevice has successfully returned.
This shows up if you do a simple tunnel add, followed by a tunnel show:
$ sudo ip tunnel add mode ipip remote 10.2.20.211
$ ip tunnel
tunl0: ip/ip remote any local any ttl inherit nopmtudisc
tunl%d: ip/ip remote 10.2.20.211 local any ttl inherit
$ sudo ip tunnel add mode sit remote 10.2.20.212
$ ip tunnel
sit0: ipv6/ip remote any local any ttl 64 nopmtudisc 6rd-prefix 2002::/16
sit%d: ioctl 89f8 failed: No such device
sit%d: ipv6/ip remote 10.2.20.212 local any ttl inherit
Cc: stable@vger.kernel.org
Signed-off-by: Ted Feng <artisdom@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Li Wei [Tue, 6 Dec 2011 21:23:45 +0000 (21:23 +0000)]
ipv6: Fix for adding multicast route for loopback device automatically.
There is no obvious reason to add a default multicast route for loopback
devices, otherwise there would be a route entry whose dst.error set to
-ENETUNREACH that would blocking all multicast packets.
====================
[ more detailed explanation ]
The problem is that the resulting routing table depends on the sequence
of interface's initialization and in some situation, that would block all
muticast packets. Suppose there are two interfaces on my computer
(lo and eth0), if we initailize 'lo' before 'eth0', the resuting routing
table(for multicast) would be
# ip -6 route show | grep ff00::
unreachable ff00::/8 dev lo metric 256 error -101
ff00::/8 dev eth0 metric 256
When sending multicasting packets, routing subsystem will return the first
route entry which with a error set to -101(ENETUNREACH).
I know the kernel will set the default ipv6 address for 'lo' when it is up
and won't set the default multicast route for it, but there is no reason to
stop 'init' program from setting address for 'lo', and that is exactly what
systemd did.
I am sure there is something wrong with kernel or systemd, currently I preferred
kernel caused this problem.
====================
Signed-off-by: Li Wei <lw@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Greg Kroah-Hartman [Mon, 12 Dec 2011 23:19:40 +0000 (15:19 -0800)]
Merge branch 'for-next/dwc3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
* 'for-next/dwc3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb: (392 commits)
usb: dwc3: ep0: fix for possible early delayed_status
usb: dwc3: gadget: fix stream enable bit
usb: dwc3: ep0: fix GetStatus handling (again)
usb: dwc3: ep0: use dwc3_request for ep0 requsts instead of usb_request
usb: dwc3: use correct hwparam register for power mgm check
usb: dwc3: omap: move to module_platform_driver
usb: dwc3: workaround: missing disconnect event
usb: dwc3: workaround: missing USB3 Reset event
usb: dwc3: workaround: U1/U2 -> U0 transiton
usb: dwc3: gadget: return early in dwc3_cleanup_done_reqs()
usb: dwc3: ep0: handle delayed_status again
usb: dwc3: ep0: push ep0state into xfernotready processing
usb: dwc3: fix sparse errors
usb: dwc3: fix few coding style problems
usb: dwc3: move generic dwc3 code from gadget into core
usb: dwc3: use a helper function for operation mode setting
usb: dwc3: ep0: don't use ep0in for transfers
usb: dwc3: ep0: use proper endianess in SetFeature for wIndex
usb: dwc3: core: drop DWC3_EVENT_BUFFERS_MAX
usb: dwc3: omap: add multiple instances support to OMAP
...
Qinglin Ye [Sun, 11 Dec 2011 08:40:22 +0000 (16:40 +0800)]
USB: Remove the duplicate definition of HUB_SET_DEPTH
The macro HUB_SET_DEPTH is defined twice in ch11.h (introduced by
commit
0eadcc0 "usb: USB3.0 ch11 definitions" and
dbe79bb "USB 3.0
Hub Changes"), so remove the duplicate one in the USB 2.0 part.
Signed-off-by: Qinglin Ye <yestyle@gmail.com>
Cc: John Youn <John.Youn@synopsys.com>
Cc: Sergei Shtylyov <sshtylyov@mvista.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Krzysztof Hałasa [Mon, 12 Dec 2011 13:51:00 +0000 (14:51 +0100)]
USB: cdc-acm: add IDs for Motorola H24 HSPA USB module.
Add USB IDs for Motorola H24 HSPA USB module.
Signed-off-by: Krzysztof Hałasa <khalasa@piap.pl>
Acked-by: Oliver Neukum <oneukum@suse.de>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>