]> git.karo-electronics.de Git - mv-sheeva.git/commit - net/mac80211/key.c
Merge branch 'wl12xx-next' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 16 Dec 2010 20:21:33 +0000 (15:21 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 16 Dec 2010 20:21:33 +0000 (15:21 -0500)
commit5928b91acae97622a6f2e679eb7a9f19bed68e3e
tree02d55145d355735b12398ad3eab61a72c78d5c4e
parent7d5f01ad536afebde9a1c81d985f8d0eaf2a9ab6
parent248daa084cee4b212ff4408e9c9b05b3bdc0da0d
Merge branch 'wl12xx-next' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx