tree 652d13b4feea9a8f562186e7badae72d2e22fe1f
parent e880eb6c5c9d98e389ffc0d8947f75d70785361a
parent 819bfecc4fc6b6e5a793f719a45b7146ce423b79
author David S. Miller <davem@davemloft.net> 1269306915 -0700
committer David S. Miller <davem@davemloft.net> 1269306915 -0700

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

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/wireless/ath/ath5k/phy.c