]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Peter Zijlstra [Wed, 30 Nov 2011 04:03:02 +0000 (15:03 +1100)]
printk: avoid double lock acquire
Commit
4f2a8d3cf5e ("printk: Fix console_sem vs logbuf_lock unlock race")
introduced another silly bug where we would want to acquire an already
held lock. Avoid this.
Reported-by: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
KAMEZAWA Hiroyuki [Wed, 30 Nov 2011 04:03:01 +0000 (15:03 +1100)]
memcg: update maintainers
More players joined to memory cgroup developments and Johannes' great work
changed internal design of memory cgroup dramatically. And he will do
more works. Michal Hokko did many bug fixes and know memory cgroup very
well. Daisuke Nishimura helped us very much but he seems busy now.
Thanks to his works.
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Cc: Balbir Singh <bsingharora@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Jonghwan Choi [Wed, 30 Nov 2011 04:03:01 +0000 (15:03 +1100)]
drivers/rtc/rtc-s3c.c: fix driver clock enable/disable balance issues
If an error occurs after the clock is enabled, the enable/disable state
can become unbalanced.
Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
David Rientjes [Wed, 30 Nov 2011 04:03:01 +0000 (15:03 +1100)]
cpusets: stall when updating mems_allowed for mempolicy or disjoint nodemask
c0ff7453bb5c ("cpuset,mm: fix no node to alloc memory when changing
cpuset's mems") adds get_mems_allowed() to prevent the set of allowed
nodes from changing for a thread. This causes any update to a set of
allowed nodes to stall until put_mems_allowed() is called.
This stall is unncessary, however, if at least one node remains unchanged
in the update to the set of allowed nodes. This was addressed by
89e8a244b97e ("cpusets: avoid looping when storing to mems_allowed if one
node remains set"), but it's still possible that an empty nodemask may be
read from a mempolicy because the old nodemask may be remapped to the new
nodemask during rebind. To prevent this, only avoid the stall if there is
no mempolicy for the thread being changed.
This is a temporary solution until all reads from mempolicy nodemasks can
be guaranteed to not be empty without the get_mems_allowed()
synchronization.
Also moves the check for nodemask intersection inside task_lock() so that
tsk->mems_allowed cannot change. This ensures that nothing can set this
tsk's mems_allowed out from under us and also protects tsk->mempolicy.
Reported-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: David Rientjes <rientjes@google.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Paul Menage <paul@paulmenage.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Kees Cook [Wed, 30 Nov 2011 04:03:00 +0000 (15:03 +1100)]
CREDITS: update Kees's expired fingerprint and fix details
Small clean-up for my CREDITS entry; the GPG fingerprint was not up to
date, so I fixed other details at the same time too.
Signed-off-by: Kees Cook <kees@outflux.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Andrea Arcangeli [Wed, 30 Nov 2011 04:03:00 +0000 (15:03 +1100)]
thp: reduce khugepaged freezing latency
Use wait_event_freezable_timeout() instead of
schedule_timeout_interruptible() to avoid missing freezer wakeups. A
try_to_freeze() would have been needed in the khugepaged_alloc_hugepage
tight loop too in case of the allocation failing repeatedly, and
wait_event_freezable_timeout will provide it too.
khugepaged would still freeze just fine by trying again the next minute
but it's better if it freezes immediately.
Reported-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Tested-by: Jiri Slaby <jslaby@suse.cz>
Cc: Tejun Heo <tj@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
Cc: "Rafael J. Wysocki" <rjw@suse.com
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Claudio Scordino [Wed, 30 Nov 2011 04:03:00 +0000 (15:03 +1100)]
fs/proc/meminfo.c: fix compilation error
Fix the error message "directives may not be used inside a macro argument"
which appears when the kernel is compiled for the cris architecture.
Signed-off-by: Claudio Scordino <claudio@evidence.eu.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Konstantin Khlebnikov [Wed, 30 Nov 2011 04:02:59 +0000 (15:02 +1100)]
vmscan: use atomic-long for shrinker batching
Use atomic-long operations instead of looping around cmpxchg().
[akpm@linux-foundation.org: massage atomic.h inclusions]
Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
Cc: Dave Chinner <david@fromorbit.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Konstantin Khlebnikov [Wed, 30 Nov 2011 04:02:59 +0000 (15:02 +1100)]
vmscan: fix initial shrinker size handling
A shrinker function can return -1, means that it cannot do anything
without a risk of deadlock. For example prune_super() does this if it
cannot grab a superblock refrence, even if nr_to_scan=0. Currently we
interpret this -1 as a ULONG_MAX size shrinker and evaluate `total_scan'
according to this. So the next time around this shrinker can cause really
big pressure. Let's skip such shrinkers instead.
Also make total_scan signed, otherwise the check (total_scan < 0) below
never works.
Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
Cc: Dave Chinner <david@fromorbit.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Stephen Rothwell [Wed, 30 Nov 2011 03:58:35 +0000 (14:58 +1100)]
Merge remote-tracking branch 'kvmtool/master'
Conflicts:
include/net/9p/9p.h
scripts/kconfig/Makefile
Stephen Rothwell [Wed, 30 Nov 2011 03:51:44 +0000 (14:51 +1100)]
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
arch/hexagon/Kconfig
arch/m68k/Kconfig
Stephen Rothwell [Wed, 30 Nov 2011 03:50:18 +0000 (14:50 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 03:48:53 +0000 (14:48 +1100)]
Merge remote-tracking branch 'writeback/writeback-for-next'
Stephen Rothwell [Wed, 30 Nov 2011 03:43:32 +0000 (14:43 +1100)]
Merge remote-tracking branch 'tmem/tmem'
Conflicts:
mm/swapfile.c
Stephen Rothwell [Wed, 30 Nov 2011 03:41:55 +0000 (14:41 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Wed, 30 Nov 2011 03:40:19 +0000 (14:40 +1100)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/iio/adc/ad799x_core.c
drivers/staging/iio/industrialio-core.c
Stephen Rothwell [Wed, 30 Nov 2011 03:38:15 +0000 (14:38 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Wed, 30 Nov 2011 03:36:24 +0000 (14:36 +1100)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile
Stephen Rothwell [Wed, 30 Nov 2011 03:30:13 +0000 (14:30 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Wed, 30 Nov 2011 03:28:47 +0000 (14:28 +1100)]
Merge remote-tracking branch 'hsi/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 03:27:15 +0000 (14:27 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 03:25:43 +0000 (14:25 +1100)]
Merge remote-tracking branch 'namespace/master'
Stephen Rothwell [Wed, 30 Nov 2011 03:24:12 +0000 (14:24 +1100)]
Merge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Wed, 30 Nov 2011 03:18:12 +0000 (14:18 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'
Conflicts:
arch/x86/xen/Kconfig
Stephen Rothwell [Wed, 30 Nov 2011 03:16:48 +0000 (14:16 +1100)]
Merge remote-tracking branch 'xen/upstream/xen'
Conflicts:
arch/x86/xen/Kconfig
Stephen Rothwell [Wed, 30 Nov 2011 03:10:01 +0000 (14:10 +1100)]
Merge remote-tracking branch 'kmemleak/kmemleak'
Stephen Rothwell [Wed, 30 Nov 2011 03:03:08 +0000 (14:03 +1100)]
Merge remote-tracking branch 'uprobes/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:56:23 +0000 (13:56 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/mips/kernel/perf_event_mipsxx.c
Stephen Rothwell [Wed, 30 Nov 2011 02:52:32 +0000 (13:52 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:51:04 +0000 (13:51 +1100)]
Merge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:44:17 +0000 (13:44 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
kernel/cgroup_freezer.c
Stephen Rothwell [Wed, 30 Nov 2011 02:41:40 +0000 (13:41 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:41:31 +0000 (13:41 +1100)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:35:20 +0000 (13:35 +1100)]
Merge remote-tracking branch 'cputime/cputime'
Stephen Rothwell [Wed, 30 Nov 2011 02:33:58 +0000 (13:33 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Wed, 30 Nov 2011 02:32:29 +0000 (13:32 +1100)]
Merge remote-tracking branch 'watchdog/linux-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:29:49 +0000 (13:29 +1100)]
Merge remote-tracking branch 'security/next'
Conflicts:
lib/Makefile
Stephen Rothwell [Wed, 30 Nov 2011 02:23:50 +0000 (13:23 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:22:20 +0000 (13:22 +1100)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:20:47 +0000 (13:20 +1100)]
Merge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:19:08 +0000 (13:19 +1100)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:17:43 +0000 (13:17 +1100)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:17:33 +0000 (13:17 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:16:03 +0000 (13:16 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:14:33 +0000 (13:14 +1100)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Wed, 30 Nov 2011 02:13:02 +0000 (13:13 +1100)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:11:29 +0000 (13:11 +1100)]
Merge remote-tracking branch 'input/next'
Conflicts:
drivers/input/keyboard/samsung-keypad.c
Stephen Rothwell [Wed, 30 Nov 2011 02:10:03 +0000 (13:10 +1100)]
Merge branch 'quilt/rr'
Stephen Rothwell [Wed, 30 Nov 2011 02:09:48 +0000 (13:09 +1100)]
Merge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Wed, 30 Nov 2011 02:08:23 +0000 (13:08 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:06:49 +0000 (13:06 +1100)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:05:17 +0000 (13:05 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Wed, 30 Nov 2011 02:03:49 +0000 (13:03 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 30 Nov 2011 02:02:18 +0000 (13:02 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Wed, 30 Nov 2011 02:00:32 +0000 (13:00 +1100)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Wed, 30 Nov 2011 01:54:39 +0000 (12:54 +1100)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Wed, 30 Nov 2011 01:50:59 +0000 (12:50 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Conflicts:
drivers/dma/pl330.c
Stephen Rothwell [Wed, 30 Nov 2011 01:49:34 +0000 (12:49 +1100)]
Merge remote-tracking branch 'target-merge/for-next-merge'
Stephen Rothwell [Wed, 30 Nov 2011 01:48:06 +0000 (12:48 +1100)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Wed, 30 Nov 2011 01:46:38 +0000 (12:46 +1100)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 01:45:15 +0000 (12:45 +1100)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Wed, 30 Nov 2011 01:45:09 +0000 (12:45 +1100)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 01:43:41 +0000 (12:43 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 01:40:15 +0000 (12:40 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
drivers/staging/media/as102/as102_drv.h
Stephen Rothwell [Wed, 30 Nov 2011 01:38:56 +0000 (12:38 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 30 Nov 2011 01:37:40 +0000 (12:37 +1100)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Wed, 30 Nov 2011 01:36:18 +0000 (12:36 +1100)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Conflicts:
drivers/i2c/busses/i2c-designware-platdrv.c
Stephen Rothwell [Wed, 30 Nov 2011 01:34:24 +0000 (12:34 +1100)]
Merge commit 'refs/next/
20111128 /hid'
Stephen Rothwell [Wed, 30 Nov 2011 01:25:37 +0000 (12:25 +1100)]
Merge remote-tracking branch 'pci/linux-next'
Stephen Rothwell [Wed, 30 Nov 2011 01:24:11 +0000 (12:24 +1100)]
Merge remote-tracking branch 'xfs/master'
Stephen Rothwell [Wed, 30 Nov 2011 01:22:55 +0000 (12:22 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Wed, 30 Nov 2011 01:21:22 +0000 (12:21 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Wed, 30 Nov 2011 01:20:02 +0000 (12:20 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 30 Nov 2011 01:18:43 +0000 (12:18 +1100)]
Merge remote-tracking branch 'logfs/master'
Conflicts:
fs/logfs/file.c
Stephen Rothwell [Wed, 30 Nov 2011 01:17:02 +0000 (12:17 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Wed, 30 Nov 2011 01:16:58 +0000 (12:16 +1100)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Wed, 30 Nov 2011 01:15:38 +0000 (12:15 +1100)]
Merge remote-tracking branch 'cifs/master'
Stephen Rothwell [Wed, 30 Nov 2011 01:14:14 +0000 (12:14 +1100)]
Merge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Wed, 30 Nov 2011 01:12:51 +0000 (12:12 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Wed, 30 Nov 2011 01:12:21 +0000 (12:12 +1100)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Wed, 30 Nov 2011 01:09:50 +0000 (12:09 +1100)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Wed, 30 Nov 2011 01:08:29 +0000 (12:08 +1100)]
Merge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 01:06:38 +0000 (12:06 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Wed, 30 Nov 2011 01:05:12 +0000 (12:05 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Conflicts:
arch/m68k/Kconfig.debug
Stephen Rothwell [Wed, 30 Nov 2011 01:03:45 +0000 (12:03 +1100)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 01:02:28 +0000 (12:02 +1100)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Wed, 30 Nov 2011 01:01:12 +0000 (12:01 +1100)]
Merge branch 'quilt/hexagon'
Stephen Rothwell [Wed, 30 Nov 2011 00:59:22 +0000 (11:59 +1100)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 00:53:59 +0000 (11:53 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Wed, 30 Nov 2011 00:52:34 +0000 (11:52 +1100)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 00:51:18 +0000 (11:51 +1100)]
Merge remote-tracking branch 's5p/for-next'
Conflicts:
arch/arm/mach-exynos/cpu.c
arch/arm/mach-exynos/include/mach/entry-macro.S
Stephen Rothwell [Wed, 30 Nov 2011 00:49:50 +0000 (11:49 +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 [Wed, 30 Nov 2011 00:39:07 +0000 (11:39 +1100)]
Merge remote-tracking branch 'at91/at91-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/at91sam926x_time.c
arch/arm/mach-at91/at91sam9_alt_reset.S
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-at91/generic.h
arch/arm/mach-at91/gpio.c
arch/arm/mach-at91/include/mach/at91cap9.h
arch/arm/mach-at91/include/mach/at91sam9260.h
arch/arm/mach-at91/include/mach/at91sam9261.h
arch/arm/mach-at91/include/mach/at91sam9263.h
arch/arm/mach-at91/include/mach/at91sam9g45.h
arch/arm/mach-at91/include/mach/at91sam9rl.h
arch/arm/mach-at91/include/mach/system.h
arch/arm/mach-at91/pm.c
arch/arm/mach-at91/setup.c
Stephen Rothwell [Wed, 30 Nov 2011 00:13:48 +0000 (11:13 +1100)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Wed, 30 Nov 2011 00:12:27 +0000 (11:12 +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-at91/setup.c
arch/arm/plat-omap/include/plat/common.h
arch/arm/tools/mach-types
Stephen Rothwell [Wed, 30 Nov 2011 00:11:04 +0000 (11:11 +1100)]
Merge remote-tracking branch 'arm-lpae/for-next'
Conflicts:
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h
arch/arm/mm/ioremap.c
Stephen Rothwell [Wed, 30 Nov 2011 00:05:11 +0000 (11:05 +1100)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 00:01:35 +0000 (11:01 +1100)]
Merge remote-tracking branch 'staging.current/staging-linus'
Stephen Rothwell [Wed, 30 Nov 2011 00:01:34 +0000 (11:01 +1100)]
Merge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Wed, 30 Nov 2011 00:01:32 +0000 (11:01 +1100)]
Merge remote-tracking branch 'wireless/master'