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 /include/linux/marker.h | |
| 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
Diffstat (limited to 'include/linux/marker.h')
0 files changed, 0 insertions, 0 deletions