summaryrefslogtreecommitdiffstats
path: root/net/xfrm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-14 01:47:31 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-14 01:47:31 +0200
commit51414d41084496aaefd06d7f19eb8206e8bfac2d (patch)
tree31c7624d28a564e1cc918a30b8570a3c001a9c7c /net/xfrm
parentMerge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff)
parentmmc: core: Bus width testing needs to handle suspend/resume (diff)
downloadlinux-51414d41084496aaefd06d7f19eb8206e8bfac2d.tar.xz
linux-51414d41084496aaefd06d7f19eb8206e8bfac2d.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: mmc: core: Bus width testing needs to handle suspend/resume
Diffstat (limited to 'net/xfrm')
0 files changed, 0 insertions, 0 deletions