From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 22 Aug 2011 02:00:37 +0000 (+1000)
Subject: Merge remote-tracking branch 'wireless/master'
X-Git-Tag: next-20110822~41
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dabd6aa637ce1bcffe9fc25d957101ea226141cd;p=karo-tx-linux.git

Merge remote-tracking branch 'wireless/master'

Conflicts:
	drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
	drivers/staging/ath6kl/os/linux/ar6000_drv.c
---

dabd6aa637ce1bcffe9fc25d957101ea226141cd