]> 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: 3cd1763 4e760f1)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 19 Oct 2012 19:48:17 +0000 (15:48 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 19 Oct 2012 19:48:17 +0000 (15:48 -0400)

Trivial merge