]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commitdiff
projects / can-eth-gw-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 75be437 c66cfd5)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Dec 2012 21:24:55 +0000 (16:24 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Dec 2012 21:24:55 +0000 (16:24 -0500)

Trivial merge