projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c

1  2 
drivers/net/wireless/iwlwifi/pcie/trans.c patch | diff1 | diff2 | blob | history

Domain: System / Kernel;