| commit | 4adeaaf51ebcc3f629f5512b96aebb5089388bca | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 18 08:37:19 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 18 08:37:19 2008 -0700 |
| tree | ce582d13c76b985d659b46b678d280f915bd8427 | |
| parent | 9732b6112343df2872518ec6701c8ef729310a05 [diff] | |
| parent | 15732a1cb5f9078d460a254449eb59391e531ffc [diff] |
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