OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
19e737c
e25aa82
)
Merge remote-tracking branch 'wireless-next/master' into HEAD
author
Johannes Berg
<johannes.berg@intel.com>
Fri, 11 Oct 2013 07:57:47 +0000
(09:57 +0200)
committer
Johannes Berg
<johannes.berg@intel.com>
Fri, 11 Oct 2013 07:57:47 +0000
(09:57 +0200)
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