| commit | 375b6f5a40a3d8373561a3dbeed440a845e6d379 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 13 17:29:53 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 13 17:29:53 2011 -0800 |
| tree | 7fe903bdfd0f67436c648394b0bcbdda55379689 | |
| parent | d8a3515e2a9523f8ed56d1f4537d16338bda2bc2 [diff] | |
| parent | 09579770dcb8769f4f61046dcd01cc758cfa6d91 [diff] |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] fix build error - arch/ia64/kernel/perfmon.c