aboutsummaryrefslogtreecommitdiff
path: root/include/linux/vme.h
diff options
context:
space:
mode:
authorJohn W. Linville2012-08-21 16:00:21 -0400
committerJohn W. Linville2012-08-21 16:00:21 -0400
commit01e17dacd47101ad7d33152bbfbbd4394352d2e6 (patch)
treed94706b87fcad04d08a46a9b3555396d21ab41ec /include/linux/vme.h
parent22c5649eef0fc37532e20c14d2656b28ca708a69 (diff)
parentdcf33963c48e1959c83fda84e336dbb000eefa3f (diff)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts: drivers/net/wireless/mac80211_hwsim.c
Diffstat (limited to 'include/linux/vme.h')
0 files changed, 0 insertions, 0 deletions