tree c77571a519905945e24a9ea6e4e44d9032fd527d
parent d9f72f359e00a45a6cd7cc2d5121b04b9dc927e1
parent 97ea6d0f3eb019891038cd2dfddb749d6bf219be
author John W. Linville <linville@tuxdriver.com> 1348845076 -0400
committer John W. Linville <linville@tuxdriver.com> 1348845076 -0400

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

Conflicts:
	net/nfc/netlink.c

Signed-off-by: John W. Linville <linville@tuxdriver.com>