]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Nov 2010 22:14:00 +0000 (07:14 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Nov 2010 22:14:00 +0000 (07:14 +0900)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
  nilfs2: fix typo in comment of nilfs_dat_move function
  nilfs2: nilfs_iget_for_gc() returns ERR_PTR


Trivial merge