diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 13:02:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 13:02:46 -0400 |
| commit | ddbb868493abdb71d6c0e3ff93f735923842de38 (patch) | |
| tree | d91aed7c58c276dd8f11c9e439027cbe0d948edb /arch/x86/kernel/hpet.c | |
| parent | 3296ca27f50ecbd71db1d808c7a72d311027f919 (diff) | |
| parent | 61b6bc525a34931bb73e4c95bfe009cd9572a288 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
cifs: remove never-used in6_addr option
cifs: add addr= mount option alias for ip=
[CIFS] Add mention of new mount parm (forceuid) to cifs readme
cifs: make overriding of ownership conditional on new mount options
cifs: fix IPv6 address length check
cifs: clean up set_cifs_acl interfaces
cifs: reorganize get_cifs_acl
[CIFS] Update readme to indicate change to default mount (serverino)
cifs: make serverino the default when mounting
cifs: rename cifs_iget to cifs_root_iget
cifs: make cnvrtDosUnixTm take a little-endian args and an offset
cifs: have cifs_NTtimeToUnix take a little-endian arg
cifs: tighten up default file_mode/dir_mode
cifs: fix artificial limit on reading symlinks
Diffstat (limited to 'arch/x86/kernel/hpet.c')
0 files changed, 0 insertions, 0 deletions