projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03f52a0 0751f86)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Nov 2012 15:56:03 +0000 (10:56 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Nov 2012 15:56:03 +0000 (10:56 -0500)
Conflicts:
drivers/net/wireless/iwlwifi/pcie/tx.c

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
John Crispins staging tree