]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit7eadca1dbb93703eb7ba13f4370f0f44fdd892a9
treecd81cb3822ef4fca5925ef3bf0775eb74e905e57
parent916a2e20d862df9fecad05b44bf968445360522b
parent80f244e10a16e60d834f91253944e09b3b16ba56
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

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