]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Jul 2011 18:03:49 +0000 (11:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Jul 2011 18:03:49 +0000 (11:03 -0700)
commitaf8a927c8bdea82cf220e0b720d64daaf073a969
tree97411751db099ab0c2022d0699e6f9df9aef2e3a
parent3110df800c4de2724624d46e6bed27efc5e9a707
parent3a36199114de0e60984534776732e0a7a220e29e
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
  nilfs2: remove resize from unsupported features list