diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 17:29:34 -0400 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 17:29:34 -0400 |
| commit | 2fceef397f9880b212a74c418290ce69e7ac00eb (patch) | |
| tree | d9cc09ab992825ef7fede4a688103503e3caf655 /fs/afs | |
| parent | feae1ef116ed381625d3731c5ae4f4ebcb3fa302 (diff) | |
| parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff) | |
Merge commit 'v2.6.26' into bkl-removal
Diffstat (limited to 'fs/afs')
| -rw-r--r-- | fs/afs/callback.c | 2 | ||||
| -rw-r--r-- | fs/afs/inode.c | 2 | ||||
| -rw-r--r-- | fs/afs/super.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/afs/callback.c b/fs/afs/callback.c index a78d5b236bb1..587ef5123cd8 100644 --- a/fs/afs/callback.c +++ b/fs/afs/callback.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | * along with this program; if not, write to the Free Software | 8 | * along with this program; if not, write to the Free Software |
| 9 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 9 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 10 | * | 10 | * |
| 11 | * Authors: David Woodhouse <dwmw2@cambridge.redhat.com> | 11 | * Authors: David Woodhouse <dwmw2@infradead.org> |
| 12 | * David Howells <dhowells@redhat.com> | 12 | * David Howells <dhowells@redhat.com> |
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
diff --git a/fs/afs/inode.c b/fs/afs/inode.c index 08db82e1343a..bb47217f6a18 100644 --- a/fs/afs/inode.c +++ b/fs/afs/inode.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | * along with this program; if not, write to the Free Software | 8 | * along with this program; if not, write to the Free Software |
| 9 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 9 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 10 | * | 10 | * |
| 11 | * Authors: David Woodhouse <dwmw2@cambridge.redhat.com> | 11 | * Authors: David Woodhouse <dwmw2@infradead.org> |
| 12 | * David Howells <dhowells@redhat.com> | 12 | * David Howells <dhowells@redhat.com> |
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
diff --git a/fs/afs/super.c b/fs/afs/super.c index 4b572b801d8d..7e3faeef6818 100644 --- a/fs/afs/super.c +++ b/fs/afs/super.c | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 10 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 11 | * | 11 | * |
| 12 | * Authors: David Howells <dhowells@redhat.com> | 12 | * Authors: David Howells <dhowells@redhat.com> |
| 13 | * David Woodhouse <dwmw2@redhat.com> | 13 | * David Woodhouse <dwmw2@infradead.org> |
| 14 | * | 14 | * |
| 15 | */ | 15 | */ |
| 16 | 16 | ||