]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commit
projects / can-eth-gw-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0f62248 d18aa87)
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
treecd81cb3822ef4fca5925ef3bf0775eb74e905e57tree | snapshot
parent0f62248501cbf5047486601d7e39d5ee36d478c2commit | diff
parentd18aa87fbfe80f33076942d11f19c9d813e835b1commit | diff
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 diff1 | diff2 | blob | history