aboutsummaryrefslogtreecommitdiffstats
path: root/include/pcmcia
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-20 09:39:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-20 09:39:40 -0700
commit05ce7bfe547c9fa967d9cab6c37867a9cb6fb3fa (patch)
treee1c4331ac8db1c28d3ea4c055353c783cf7f01ac /include/pcmcia
parentMerge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 (diff)
parentquota: Convert __DQUOT_PARANOIA symbol to standard config option (diff)
downloadlinux-dev-05ce7bfe547c9fa967d9cab6c37867a9cb6fb3fa.tar.xz
linux-dev-05ce7bfe547c9fa967d9cab6c37867a9cb6fb3fa.zip
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6: quota: Convert __DQUOT_PARANOIA symbol to standard config option
Diffstat (limited to 'include/pcmcia')
0 files changed, 0 insertions, 0 deletions