Merge tag 'please-pull-misc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Sep 2013 20:16:01 +0000 (13:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Sep 2013 20:16:01 +0000 (13:16 -0700)
commit1bda20da20e5c64919efcb507a84e192deed1c60
treec0c6942fad5f73db57c02ac46dbc80657a67d772
parent4de9ad9bc08b4953fc03336ad38908496e2f8826
parent44fd81fe7eb8029a37ec83f15d4ef3585dd81bb6
Merge tag 'please-pull-misc-3.12' of git://git./linux/kernel/git/aegl/linux

Pull ia64 fixes from Tony Luck:
 "Couple of small cleanups for ia64"

* tag 'please-pull-misc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  [IA64] Use asm-generic/bitops/builtin-ffs.h
  [IA64] dmi.h: Make dmi_alloc use kzalloc