Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
[deliverable/linux.git] / arch / arm / mach-pxa / trizeps4.c
CommitLineData