Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Sep 2009 21:24:33 +0000 (14:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Sep 2009 21:24:33 +0000 (14:24 -0700)
commit5a09adf13067609d8ab9fcae11dc99fd0084e35c
treebe2908bf2a8a20e9bebb4a064611ca5c2e2977f9
parent931f70350e9c298887c78e852d179ef7efcce304
parentb1f1b8ce0a1d71cbc72f7540134d52b79bd8f5ac
Merge branch 'for-linus' of git://git./linux/kernel/git/ryusuke/nilfs2

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
  nilfs2: fix preempt count underflow in nilfs_btnode_prepare_change_key