Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Sep 2010 21:38:54 +0000 (14:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Sep 2010 21:38:54 +0000 (14:38 -0700)
commitadd2b10f2ba15ac231181306c975e58d26f9bd54
treee3196992ab39adfa42a4fe4234f9f6b2ce0ba5b1
parent3c5dff7b5ec7ac1bf356d43ac37e2e4ec7ec063a
parent3e073367a57d41e506f20aebb98e308387ce3090
Merge branch 'for-linus' of git://git./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