diff options
| author | Linus Torvalds | 2008-05-23 08:15:12 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2008-05-23 08:15:12 -0700 |
| commit | cbff290491cd97bcd449b14f672d98992ddad5cb (patch) | |
| tree | 0ad09b551606771de5ec966170bdc6008cfa513c /fs/cifs | |
| parent | 6483d152acffb83442b90dad1517fde8a7b1e12d (diff) | |
| parent | 8962cadbe7cbc4ed0fff94f56ebab505a10afd2e (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] iSeries: Remove unused mail address
[POWERPC] mpic: Fix use of uninitialized variable
[POWERPC] Add kernstart_addr to list of allowed symbols in prom_init
[POWERPC] Fix __set_fixmap() for STRICT_MM_TYPECHECKS
[POWERPC] PS3: Fix memory hotplug
Diffstat (limited to 'fs/cifs')
0 files changed, 0 insertions, 0 deletions