| commit | add2b10f2ba15ac231181306c975e58d26f9bd54 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Sep 07 14:38:54 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Sep 07 14:38:54 2010 -0700 |
| tree | e3196992ab39adfa42a4fe4234f9f6b2ce0ba5b1 | |
| parent | 3c5dff7b5ec7ac1bf356d43ac37e2e4ec7ec063a [diff] | |
| parent | 3e073367a57d41e506f20aebb98e308387ce3090 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6: alpha: Fix printk format errors alpha: convert perf_event to use local_t Fix call to replaced SuperIO functions alpha: remove homegrown L1_CACHE_ALIGN macro