tree eaedc03d42ee2bf6200fc07b080a99bad103def3
parent 4562487a00445eab96311365ba15c41dc4d043cd
parent 268bae0b6879f238ba57f5f801958d1254e136f7
author John W. Linville <linville@tuxdriver.com> 1282762302 -0400
committer John W. Linville <linville@tuxdriver.com> 1282762302 -0400

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
	drivers/net/wireless/libertas/if_sdio.c