projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
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...
author
John W. Linville
<linville@tuxdriver.com>
Fri, 16 Nov 2012 19:07:54 +0000
(14:07 -0500)
committer
John 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
diff --cc
drivers/net/wireless/iwlwifi/pcie/trans.c
Simple merge
projects / openwrt / staging / blogic.git / commitdiff