commit | d5aedd7e1b2f024ced0486aeb730bc56875e5ac9 | [log] [tgz] |
---|---|---|
author | John W. Linville <linville@tuxdriver.com> | Mon Nov 25 15:47:18 2013 -0500 |
committer | John W. Linville <linville@tuxdriver.com> | Mon Nov 25 15:47:18 2013 -0500 |
tree | 8ba9d15789748952e5e02d7a8a4a8cda0e16ccfd | |
parent | 517543fd72d577dde2ebd9505dc4abf26d589f9a [diff] | |
parent | 24d47300d118c5909a51b7270276d749cce150a2 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211