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

This commit is contained in:
Greg Kroah-Hartman 2006-08-03 22:44:55 -07:00
commit 53c7d2b770
3 changed files with 120 additions and 15 deletions