tree 8fafcc789dc06e90665e6eee6388af228bbd2fd7
parent 242647bcf8464860f173f3d4d4ab3490d3558518
parent 815868e7b5c207ba42d5b317ccc51f8112732268
author John W. Linville <linville@tuxdriver.com> 1279051049 -0400
committer John W. Linville <linville@tuxdriver.com> 1279051049 -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/wl12xx/wl1271_cmd.h