summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-17 00:02:20 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-17 00:02:20 +0200
commit8b97b21e0f4f59801d05a5c536417f04ecfb5603 (patch)
tree47c95c95a4f93a4596dc57204176ceb432234eba /drivers/mmc
parentmigrate: don't account swapcache as shmem (diff)
parentproc: Fix Oops on stat of /proc/<zombie pid>/ns/net (diff)
downloadlinux-8b97b21e0f4f59801d05a5c536417f04ecfb5603.tar.xz
linux-8b97b21e0f4f59801d05a5c536417f04ecfb5603.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd
* git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd: proc: Fix Oops on stat of /proc/<zombie pid>/ns/net
Diffstat (limited to 'drivers/mmc')
0 files changed, 0 insertions, 0 deletions