summaryrefslogtreecommitdiffstats
path: root/drivers/media/rc/keymaps/rc-terratec-slim.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-11-07 04:10:14 +0100
committerLen Brown <len.brown@intel.com>2011-11-07 04:10:14 +0100
commite751b759e82629798c4a5e4a87eb3a30c0510154 (patch)
tree225043e83eecdce1ac8d8ccb6d5a115c5d0b6461 /drivers/media/rc/keymaps/rc-terratec-slim.c
parentACPI atomicio: Convert width in bits to bytes in __acpi_ioremap_fast() (diff)
parentACPI: Fix possible recursive locking in hwregs.c (diff)
parentACPI: Fix CONFIG_ACPI_DOCK=n compiler warning (diff)
parentACPI: Export FADT pm_profile integer value to userspace (diff)
parentPNPACPI: Simplify disabled resource registration (diff)
downloadlinux-e751b759e82629798c4a5e4a87eb3a30c0510154.tar.xz
linux-e751b759e82629798c4a5e4a87eb3a30c0510154.zip
Merge branches 'atomic-io', 'lockdep', 'misc', 'pm-profile' and 'pnp-cleanup' into acpi