diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 08:37:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 08:37:19 -0700 |
| commit | 4adeaaf51ebcc3f629f5512b96aebb5089388bca (patch) | |
| tree | ce582d13c76b985d659b46b678d280f915bd8427 /kernel | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-kgdb (diff) | |
| parent | jfs: replace __inline with inline (diff) | |
| download | linux-dev-4adeaaf51ebcc3f629f5512b96aebb5089388bca.tar.xz linux-dev-4adeaaf51ebcc3f629f5512b96aebb5089388bca.zip | |
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions