Merge tag 'please-pull-misc-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Dec 2012 15:50:18 +0000 (07:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Dec 2012 15:50:18 +0000 (07:50 -0800)
commit70f2836d023237868f2fef3625da84643e5aaf33
tree982331c1a7980003123566d1ad7280d3a2c86e42
parent97ebe8f55ae99059c0ad3d3be5c0417647f5e3e0
parent4fafc8c21487f6b5259d462e9bee98661a02390d
Merge tag 'please-pull-misc-3.8' of git://git./linux/kernel/git/aegl/linux

Pull ia64 fix from Tony Luck:
 "Miscellaneous ia64 fix for 3.8.  Just need to avoid a pending
  namespace collision from other work being merged."

* tag 'please-pull-misc-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  [IA64] Resolve name space collision for cache_show()