Merge tag 'jfs-3.10' of git://github.com/kleikamp/linux-shaggy
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 May 2013 16:57:16 +0000 (09:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 May 2013 16:57:16 +0000 (09:57 -0700)
commit86652188f345edec56b0074a65f6db17f16eb359
treecbaf3a5e62b0c05ac74043685f63abde29a80c25
parent14a9e5c09d13aa36b88ea54b8b6134b60ff2a410
parent73aaa22d5ffb2630456bac2f9a4ed9b81d0d7271
Merge tag 'jfs-3.10' of git://github.com/kleikamp/linux-shaggy

Pull jfs fixes from David Kleikamp:
 "A couple fixes for jfs"

(What's with the unhelpful pull request "explanations" from fs people
today?)

* tag 'jfs-3.10' of git://github.com/kleikamp/linux-shaggy:
  jfs: fix a couple races
  jfs: avoid undefined behavior from left-shifting by 32 bits