diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-24 10:10:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-24 10:10:13 -0700 |
| commit | 1a7c55368c7c8749aa9326c29a50e79a4eba5d26 (patch) | |
| tree | abbbfe79f7362a2f2d2fa478c57f943514338ae2 /drivers/media/dvb/mantis | |
| parent | bd45fe539f0e26ff8d76b4cb954195ab8a6467af (diff) | |
| parent | 25edd6946a1d74e5e77813c2324a0908c68bcf9e (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: Get rid of indirect p1275 PROM call buffer.
sparc64: Fill a missing delay slot.
sparc64: Make lock backoff really a NOP on UP builds.
sparc64: simple microoptimizations for atomic functions
sparc64: Make rwsems 64-bit.
sparc64: Really fix atomic64_t interface types.
Diffstat (limited to 'drivers/media/dvb/mantis')
0 files changed, 0 insertions, 0 deletions