summaryrefslogtreecommitdiff
path: root/security/apparmor
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-04-14 17:54:40 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-14 17:54:40 (GMT)
commitba3b7d827e96e90e3df82695c96b3f9a666c0d82 (patch)
treec491c4152ec5dcc80cf557a7562116a787024911 /security/apparmor
parent4f9a197c223cc019801be948e444d05904391109 (diff)
parentb2dfaa8d33cee9dd4ed78979f5d70063df546101 (diff)
downloadlinux-fsl-qoriq-ba3b7d827e96e90e3df82695c96b3f9a666c0d82.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu fix from Greg Ungerer: "This contains only a single compilation fix for ColdFire m68k targets that use local non-GPIOLIB support." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68k: define a local gpio_request_one() function
Diffstat (limited to 'security/apparmor')
0 files changed, 0 insertions, 0 deletions