summaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-06 12:19:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-06 12:19:38 -0700
commit18b15fcde715a5512671af9d72a76e7f6d7cb6f0 (patch)
tree073ca0c45f48abae1809e86efc06e22e7528f0e7 /include/media
parent271fd5d7286eb931142402c170943d14640bb922 (diff)
parentab27a20e6212cd1d96d813352b47e1fc1cfd01db (diff)
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes form Peter Anvin * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND arch/x86/platform/geode/net5501.c: change active_low to 0 for LED driver x86, relocs: Remove an unused variable asm-generic: Use __BITS_PER_LONG in statfs.h x86/amd: Re-enable CPU topology extensions in case BIOS has disabled it
Diffstat (limited to 'include/media')
0 files changed, 0 insertions, 0 deletions