From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Sep 2013 20:16:01 +0000 (-0700)
Subject: Merge tag 'please-pull-misc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.12-rc1~119
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=1bda20da20e5c64919efcb507a84e192deed1c60;p=~andy%2Flinux

Merge tag 'please-pull-misc-3.12' of git://git.kernel.org/pub/scm/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
---

1bda20da20e5c64919efcb507a84e192deed1c60