Merge master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

Browse source

* master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  [GFS2] Fix Kconfig
  [DLM] fix compile warning

...

This commit is contained in:

Linus Torvalds 2006-12-21 00:13:09 -08:00

parent bc947631d1 1003f06953

commit ba6d8b1eba

2 changed files with 4 additions and 2 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

2

fs/dlm/lowcomms-tcp.c

View file

4

fs/gfs2/Kconfig

View file