diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-26 10:44:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-26 10:44:41 -0400 |
| commit | e80391500078b524083ba51c3df01bbaaecc94bb (patch) | |
| tree | ba1ed8c744654ca91ee2b71b7cdee149c8edbef1 /fs/file.c | |
| parent | 2a4f739dfc59edd52eaa37d63af1bd830ea42318 (diff) | |
| parent | 012d64ff68f304df1c35ce5902f5023dc14b643f (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Fix memory corruption in pci_4u_free_consistent().
[SPARC64]: Fix central/FHC bus handling on Ex000 systems.
Diffstat (limited to 'fs/file.c')
0 files changed, 0 insertions, 0 deletions