Brian Behlendorf
|
622cf66365
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 13:16:05 -08:00 |
|
Brian Behlendorf
|
e7a7c9d048
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 13:16:04 -08:00 |
|
Brian Behlendorf
|
6045ba2f04
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:16:00 -08:00 |
|
Brian Behlendorf
|
94e5c3a9ba
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-05 13:15:59 -08:00 |
|
Brian Behlendorf
|
b6423c7d27
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 13:15:58 -08:00 |
|
Brian Behlendorf
|
41bfccbcd1
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:15:53 -08:00 |
|
Brian Behlendorf
|
5eadaf87dd
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-05 13:15:52 -08:00 |
|
Brian Behlendorf
|
38b3eeeb0c
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:15:49 -08:00 |
|
Brian Behlendorf
|
d82e8e8dbf
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-05 13:15:47 -08:00 |
|
Brian Behlendorf
|
175de1eefb
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:15:45 -08:00 |
|
Brian Behlendorf
|
e6fb388010
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-05 13:15:43 -08:00 |
|
Brian Behlendorf
|
bd03f855ba
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:15:40 -08:00 |
|
Brian Behlendorf
|
74959ab27b
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-05 13:15:39 -08:00 |
|
Brian Behlendorf
|
ea8856d972
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:15:36 -08:00 |
|
Brian Behlendorf
|
b2e19e7987
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-05 13:15:35 -08:00 |
|
Brian Behlendorf
|
947f6b865d
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:15:32 -08:00 |
|
Brian Behlendorf
|
aa1783d2a8
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-05 13:15:31 -08:00 |
|
Brian Behlendorf
|
db25fe1918
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:15:28 -08:00 |
|
Brian Behlendorf
|
6618b36bdf
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-05 13:15:26 -08:00 |
|
Brian Behlendorf
|
861ec17294
|
Update libunicode
|
2009-01-05 13:13:50 -08:00 |
|
Brian Behlendorf
|
bee710acce
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:45:41 -08:00 |
|
Brian Behlendorf
|
35cfc1bb85
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-05 12:45:38 -08:00 |
|
Brian Behlendorf
|
7ae4c6f6f4
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:45:32 -08:00 |
|
Brian Behlendorf
|
13e4ebb0b3
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-05 12:45:29 -08:00 |
|
Brian Behlendorf
|
d74997beb1
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:45:24 -08:00 |
|
Brian Behlendorf
|
0f742dfc96
|
Refresh context
|
2009-01-05 12:45:17 -08:00 |
|
Brian Behlendorf
|
8d32788b9a
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:42:36 -08:00 |
|
Brian Behlendorf
|
0e00972b2a
|
Resolve conflict
|
2009-01-05 12:42:30 -08:00 |
|
Brian Behlendorf
|
4ec79ddfff
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:41:46 -08:00 |
|
Brian Behlendorf
|
681ba5c296
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-05 12:41:42 -08:00 |
|
Brian Behlendorf
|
6484bf11ef
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:41:36 -08:00 |
|
Brian Behlendorf
|
d51fb2c1d6
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-05 12:41:33 -08:00 |
|
Brian Behlendorf
|
d79dfa84c8
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:41:28 -08:00 |
|
Brian Behlendorf
|
727a4622dc
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-05 12:41:24 -08:00 |
|
Brian Behlendorf
|
9efc2b6ca8
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:41:18 -08:00 |
|
Brian Behlendorf
|
9c73332e81
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-05 12:41:15 -08:00 |
|
Brian Behlendorf
|
402d2ae37a
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:41:08 -08:00 |
|
Brian Behlendorf
|
144eca0e84
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-05 12:41:04 -08:00 |
|
Brian Behlendorf
|
f668f991b4
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:40:58 -08:00 |
|
Brian Behlendorf
|
d5350109f4
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-05 12:40:55 -08:00 |
|
Brian Behlendorf
|
97af0dcdbc
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:40:50 -08:00 |
|
Brian Behlendorf
|
6ce317a8d5
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 12:40:48 -08:00 |
|
Brian Behlendorf
|
e47b15f886
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:40:41 -08:00 |
|
Brian Behlendorf
|
1751caa615
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 12:40:38 -08:00 |
|
Brian Behlendorf
|
5d49f45c50
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 12:40:37 -08:00 |
|
Brian Behlendorf
|
beb2376e5d
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:40:28 -08:00 |
|
Brian Behlendorf
|
1dd185c19d
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-05 12:40:26 -08:00 |
|
Brian Behlendorf
|
9c2bf69ecb
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 12:40:25 -08:00 |
|
Brian Behlendorf
|
999fe3c9ca
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:40:15 -08:00 |
|
Brian Behlendorf
|
9cd0ad6ce7
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-05 12:40:13 -08:00 |