tree 910e531540bda17c484b53b89fb2f1d6dd41a454
parent 78d4a42069b4815040a857a4e9bb0e4fb0aa1dc8
parent 77a42796786c2ea2d3a67262fb5f1f707c3e0594
author Linus Torvalds <torvalds@linux-foundation.org> 1384161427 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1384161427 +0900

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven:
 "Summary:
   - __put_user_unaligned may/will be used by btrfs
   - m68k part of a global cleanup"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Remove deprecated IRQF_DISABLED
  m68k/m68knommu: Implement __get_user_unaligned/__put_user_unaligned()