aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/memcontrol.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-24 12:25:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-24 12:25:27 -0700
commit22e93eddd9c63c61e5a38b82eea08f6095189e7f (patch)
treec5b2816b7367288e402101eea338837789afc019 /include/linux/memcontrol.h
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parentInput: ucb1400_ts - enable interrupt unconditionally (diff)
downloadlinux-dev-22e93eddd9c63c61e5a38b82eea08f6095189e7f.tar.xz
linux-dev-22e93eddd9c63c61e5a38b82eea08f6095189e7f.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: ucb1400_ts - enable interrupt unconditionally Input: ucb1400_ts - enable ADC Filter Input: wacom - don't use on-stack memory for report buffers Input: iforce - support new revision of ACT LABS Force RS Input: joydev - decouple axis and button map ioctls from input constants
Diffstat (limited to 'include/linux/memcontrol.h')
0 files changed, 0 insertions, 0 deletions