Brian Behlendorf
|
68708f6114
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-08 11:28:14 -08:00 |
|
Brian Behlendorf
|
94b08b3b91
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-08 11:28:13 -08:00 |
|
Brian Behlendorf
|
c77cf87aff
|
Add kmem_* mapping for userspace
|
2008-12-08 11:26:28 -08:00 |
|
Brian Behlendorf
|
7c6de8b41c
|
Add missing cast
|
2008-12-08 10:32:55 -08:00 |
|
Brian Behlendorf
|
e35086615d
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:28:45 -08:00 |
|
Brian Behlendorf
|
c8eb06eaf1
|
Move strings.h from include/sys up a level to include
|
2008-12-08 10:27:04 -08:00 |
|
Brian Behlendorf
|
9e493fa265
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:21:14 -08:00 |
|
Brian Behlendorf
|
b73a1f59ab
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-08 10:21:13 -08:00 |
|
Brian Behlendorf
|
dbd2555cca
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-08 10:21:10 -08:00 |
|
Brian Behlendorf
|
3cadd57598
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:21:10 -08:00 |
|
Brian Behlendorf
|
a485f15853
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:21:07 -08:00 |
|
Brian Behlendorf
|
01321a5a15
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-08 10:21:06 -08:00 |
|
Brian Behlendorf
|
9f31a9c4a5
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:21:03 -08:00 |
|
Brian Behlendorf
|
2de0a41170
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-08 10:21:02 -08:00 |
|
Brian Behlendorf
|
c2a7fcb844
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-08 10:20:59 -08:00 |
|
Brian Behlendorf
|
f4d7486597
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:20:59 -08:00 |
|
Brian Behlendorf
|
d26ade001d
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:20:56 -08:00 |
|
Brian Behlendorf
|
8ea44c46a1
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-08 10:20:55 -08:00 |
|
Brian Behlendorf
|
7f7581a410
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:20:52 -08:00 |
|
Brian Behlendorf
|
c39199a4e1
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-08 10:20:51 -08:00 |
|
Brian Behlendorf
|
73c9720771
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-08 10:20:48 -08:00 |
|
Brian Behlendorf
|
248199fd23
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:20:48 -08:00 |
|
Brian Behlendorf
|
b193906b8f
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:20:45 -08:00 |
|
Brian Behlendorf
|
792be24cfe
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-08 10:20:44 -08:00 |
|
Brian Behlendorf
|
57bf619066
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:20:41 -08:00 |
|
Brian Behlendorf
|
a40c9c777e
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-08 10:20:40 -08:00 |
|
Brian Behlendorf
|
040c6b6cd2
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-08 10:20:37 -08:00 |
|
Brian Behlendorf
|
b5dd15ecb3
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:20:37 -08:00 |
|
Brian Behlendorf
|
71fcf7ce08
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-08 10:20:36 -08:00 |
|
Brian Behlendorf
|
dadc52bf3f
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-08 10:20:31 -08:00 |
|
Brian Behlendorf
|
2e1c565b62
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:20:31 -08:00 |
|
Brian Behlendorf
|
16b474d158
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-08 10:20:30 -08:00 |
|
Brian Behlendorf
|
98a66e66e4
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:20:25 -08:00 |
|
Brian Behlendorf
|
50c01b480a
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-08 10:20:24 -08:00 |
|
Brian Behlendorf
|
cb6b4efcb6
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:20:21 -08:00 |
|
Brian Behlendorf
|
7e094a95b5
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-08 10:20:20 -08:00 |
|
Brian Behlendorf
|
e2da082305
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-08 10:20:17 -08:00 |
|
Brian Behlendorf
|
b758c0e0c2
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:20:17 -08:00 |
|
Brian Behlendorf
|
886f59fa63
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:20:14 -08:00 |
|
Brian Behlendorf
|
8af5e22d21
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-08 10:20:13 -08:00 |
|
Brian Behlendorf
|
8dded7d40f
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:20:10 -08:00 |
|
Brian Behlendorf
|
fde2956795
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-08 10:20:09 -08:00 |
|
Brian Behlendorf
|
f9c8264ee6
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-08 10:20:06 -08:00 |
|
Brian Behlendorf
|
1064035639
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:20:06 -08:00 |
|
Brian Behlendorf
|
4a689eed9b
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:20:03 -08:00 |
|
Brian Behlendorf
|
9536bf0660
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-08 10:20:02 -08:00 |
|
Brian Behlendorf
|
85f71237d9
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-08 10:20:01 -08:00 |
|
Brian Behlendorf
|
35c322451f
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-08 10:20:00 -08:00 |
|
Brian Behlendorf
|
4c7ed56833
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-08 10:20:00 -08:00 |
|
Brian Behlendorf
|
5cf55d35dd
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-08 10:20:00 -08:00 |