Merge remote-tracking branch 'wireless/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 02:10:35 +0000 (12:10 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 02:10:35 +0000 (12:10 +1000)

Trivial merge