Brian Behlendorf
|
67d05ea374
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:45:01 -08:00 |
|
Brian Behlendorf
|
1cdc368818
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 14:45:00 -08:00 |
|
Brian Behlendorf
|
d083da9305
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:44:57 -08:00 |
|
Brian Behlendorf
|
04647f009f
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-12 14:44:56 -08:00 |
|
Brian Behlendorf
|
a0f05dd6aa
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:44:52 -08:00 |
|
Brian Behlendorf
|
9b1a5db258
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 14:44:51 -08:00 |
|
Brian Behlendorf
|
7f5f204588
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:44:48 -08:00 |
|
Brian Behlendorf
|
101f25ad24
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-12 14:44:47 -08:00 |
|
Brian Behlendorf
|
f900b68982
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:44:44 -08:00 |
|
Brian Behlendorf
|
a12b0d1071
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-12 14:44:43 -08:00 |
|
Brian Behlendorf
|
f215d9386a
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:44:40 -08:00 |
|
Brian Behlendorf
|
5da62b9f20
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-12 14:44:38 -08:00 |
|
Brian Behlendorf
|
0dc01d9fad
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:44:35 -08:00 |
|
Brian Behlendorf
|
84fa76de58
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-12 14:44:34 -08:00 |
|
Brian Behlendorf
|
a6c61ad80e
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:44:31 -08:00 |
|
Brian Behlendorf
|
a955848091
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 14:44:30 -08:00 |
|
Brian Behlendorf
|
cf9f48949d
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:44:26 -08:00 |
|
Brian Behlendorf
|
d36ee76b0c
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 14:44:25 -08:00 |
|
Brian Behlendorf
|
44664b4923
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:44:22 -08:00 |
|
Brian Behlendorf
|
52044a9601
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 14:44:21 -08:00 |
|
Brian Behlendorf
|
754db0f9c8
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:44:18 -08:00 |
|
Brian Behlendorf
|
2db63133a3
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 14:44:17 -08:00 |
|
Brian Behlendorf
|
1519a7f767
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 14:44:16 -08:00 |
|
Brian Behlendorf
|
193c6b2c62
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:44:11 -08:00 |
|
Brian Behlendorf
|
46466ff04e
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-12 14:44:09 -08:00 |
|
Brian Behlendorf
|
96cb73d58b
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 14:44:09 -08:00 |
|
Brian Behlendorf
|
ce57eaed9f
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:44:03 -08:00 |
|
Brian Behlendorf
|
2085d7ed6e
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 14:44:02 -08:00 |
|
Brian Behlendorf
|
d73c532a20
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:43:59 -08:00 |
|
Brian Behlendorf
|
c1e0c65e55
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-12 14:43:58 -08:00 |
|
Brian Behlendorf
|
96952bdc49
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:43:54 -08:00 |
|
Brian Behlendorf
|
d2fb78a491
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 14:43:53 -08:00 |
|
Brian Behlendorf
|
30bebda46a
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:43:50 -08:00 |
|
Brian Behlendorf
|
3d74571519
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-12 14:43:49 -08:00 |
|
Brian Behlendorf
|
fb6f955a33
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:43:46 -08:00 |
|
Brian Behlendorf
|
0bd85494e2
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-12 14:43:45 -08:00 |
|
Brian Behlendorf
|
82e015b407
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:43:42 -08:00 |
|
Brian Behlendorf
|
28656e61f9
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-12 14:43:40 -08:00 |
|
Brian Behlendorf
|
17d90b5122
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:43:37 -08:00 |
|
Brian Behlendorf
|
fb02395946
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-12 14:43:36 -08:00 |
|
Brian Behlendorf
|
f981fad7c1
|
Add 5 missing headers
|
2008-12-12 14:41:45 -08:00 |
|
Brian Behlendorf
|
cf89e6e4b3
|
Refresh Makefile
|
2008-12-12 14:37:13 -08:00 |
|
Brian Behlendorf
|
c28f326d89
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:30:20 -08:00 |
|
Brian Behlendorf
|
0dcb08e7fd
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 14:30:19 -08:00 |
|
Brian Behlendorf
|
a55adfb527
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:30:16 -08:00 |
|
Brian Behlendorf
|
64a53b30dc
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-12 14:30:14 -08:00 |
|
Brian Behlendorf
|
52f5b06caa
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:30:11 -08:00 |
|
Brian Behlendorf
|
b1af545c03
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 14:30:10 -08:00 |
|
Brian Behlendorf
|
37baf971dc
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:30:07 -08:00 |
|
Brian Behlendorf
|
437092574a
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-12 14:30:06 -08:00 |