| commit | 70f2836d023237868f2fef3625da84643e5aaf33 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 12 07:50:18 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 12 07:50:18 2012 -0800 |
| tree | 982331c1a7980003123566d1ad7280d3a2c86e42 | |
| parent | 97ebe8f55ae99059c0ad3d3be5c0417647f5e3e0 [diff] | |
| parent | 4fafc8c21487f6b5259d462e9bee98661a02390d [diff] |
Merge tag 'please-pull-misc-3.8' of git://git.kernel.org/pub/scm/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()