From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 5 Dec 2011 01:36:59 +0000 (+1100)
Subject: Merge remote-tracking branch 'wireless-next/master'
X-Git-Tag: next-20111205~50
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2109d8dce3bb85f22b10b315631e20ccdd5b0d23;p=karo-tx-linux.git

Merge remote-tracking branch 'wireless-next/master'

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn.c
---

2109d8dce3bb85f22b10b315631e20ccdd5b0d23