Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6

Browse source

* '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

...

This commit is contained in:

Linus Torvalds 2008-04-18 08:37:19 -07:00

parent 9732b61123 15732a1cb5

commit 4adeaaf51e

4 changed files with 20 additions and 34 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

11

fs/jfs/jfs_dmap.c

View file

2

fs/jfs/jfs_dmap.h

View file

15

fs/jfs/jfs_imap.c

View file

26

fs/jfs/jfs_xtree.c

View file