Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 16 Nov 2012 19:07:54 +0000 (14:07 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 16 Nov 2012 19:07:54 +0000 (14:07 -0500)
commitdfbebe14428803402293d9a8bf1efef7221d8b78
treecd81cb3822ef4fca5925ef3bf0775eb74e905e57
parent0f62248501cbf5047486601d7e39d5ee36d478c2
parentd18aa87fbfe80f33076942d11f19c9d813e835b1
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next

Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c
drivers/net/wireless/iwlwifi/pcie/trans.c