summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/gpio.h
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-08-15 07:06:31 +0200
committerLen Brown <len.brown@intel.com>2010-08-15 07:06:31 +0200
commit95ee46aa8698f2000647dfb362400fadbb5807cf (patch)
treee5a05c7297f997e191c73091934e42e3195c0e40 /arch/arm/include/asm/gpio.h
parentgcc-4.6: ACPI: fix unused but set variables in ACPI (diff)
parentMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff)
downloadlinux-95ee46aa8698f2000647dfb362400fadbb5807cf.tar.xz
linux-95ee46aa8698f2000647dfb362400fadbb5807cf.zip
Merge branch 'linus' into release
Conflicts: drivers/acpi/debug.c Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/arm/include/asm/gpio.h')
0 files changed, 0 insertions, 0 deletions