| commit | bd1d23a81083f03ac63afbb7656b87eed04d8953 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 06 18:18:43 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 06 18:18:43 2008 -0700 |
| tree | 61845e5e70f971e0eafc7881db8cc9fb1e85dc73 | |
| parent | c0a18111e571138747a98af18b3a2124df56a0d1 [diff] | |
| parent | d45100f7b69e3d9cd0cd5e956b6ac2c78d460d07 [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: Fix initrd regression. usb: Sparc build fix, make USB_ISP1760_OF depend on PPC_OF sparc64: remove online_page() sparc64: use compat_sys_utimes instead of home-grown local copy. sbus: Fix bpp driver build. sparc video: make blank use proper constant Revert "[SPARC64]: Wrap SMP IPIs with irq_enter()/irq_exit()." sparc: tcx.c remove unnecessary function