| commit | 4d15393d20c1934a296a999d8ede125532d21cc4 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 09 21:05:17 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 09 21:05:17 2010 -0700 |
| tree | a1ad6f5314857c1d9dfd4ba981003c2853b8027f | |
| parent | 7fbd15f9b42f2c30ceeb94776a111d0c28669e0c [diff] | |
| parent | 2dc4ec5de039d5db4805dff170ab80f4e990e977 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Update defconfig. sparc: Kill user copy check code. sparc64: Fix perf_arch_get_caller_regs(). sparc64: Add missing ID to parport probing code.