]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48c3e37 75a423f)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 22 Aug 2013 15:35:22 +0000 (11:35 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 22 Aug 2013 15:35:22 +0000 (11:35 -0400)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.