]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Apr 2008 15:37:19 +0000 (08:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Apr 2008 15:37:19 +0000 (08:37 -0700)
commit4adeaaf51ebcc3f629f5512b96aebb5089388bca
treece582d13c76b985d659b46b678d280f915bd8427
parent9732b6112343df2872518ec6701c8ef729310a05
parent15732a1cb5f9078d460a254449eb59391e531ffc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
  jfs: replace __inline with inline
  jfs: le*_add_cpu conversion