Brian Behlendorf
|
42ae497625
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-19 12:08:33 -08:00 |
|
Brian Behlendorf
|
1583a220d9
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-19 12:08:30 -08:00 |
|
Brian Behlendorf
|
3ce12f6815
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 12:08:24 -08:00 |
|
Brian Behlendorf
|
85f2c8ff15
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-19 12:08:20 -08:00 |
|
Brian Behlendorf
|
e485017676
|
Remove spa_boot from userspace build
|
2008-12-19 12:04:45 -08:00 |
|
Brian Behlendorf
|
5f0e8b8d91
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:57:25 -08:00 |
|
Brian Behlendorf
|
273cbc844a
|
Fix trailing 'a' char
|
2008-12-19 11:55:38 -08:00 |
|
Brian Behlendorf
|
02bef1e61b
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:50:09 -08:00 |
|
Brian Behlendorf
|
f9a746f44f
|
Flesh out some more of the sunddi
|
2008-12-19 11:48:21 -08:00 |
|
Brian Behlendorf
|
b8e10bfc20
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:32:33 -08:00 |
|
Brian Behlendorf
|
615168d176
|
Stub out additional sunddi interfaces
|
2008-12-19 11:30:42 -08:00 |
|
Brian Behlendorf
|
1fb4f38e73
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:14:55 -08:00 |
|
Brian Behlendorf
|
ce80c4a422
|
Add utsname.h header
|
2008-12-19 11:13:07 -08:00 |
|
Brian Behlendorf
|
da8728cb6f
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:07:24 -08:00 |
|
Brian Behlendorf
|
5fb6644efc
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-19 11:07:23 -08:00 |
|
Brian Behlendorf
|
8376bee024
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:07:20 -08:00 |
|
Brian Behlendorf
|
e52ef28e68
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-19 11:07:19 -08:00 |
|
Brian Behlendorf
|
993ebfa8c6
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:07:15 -08:00 |
|
Brian Behlendorf
|
01a745ee24
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 11:07:14 -08:00 |
|
Brian Behlendorf
|
6f7ee22b41
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:07:11 -08:00 |
|
Brian Behlendorf
|
5f5472f79c
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 11:07:10 -08:00 |
|
Brian Behlendorf
|
9c2d42f7c8
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:07:06 -08:00 |
|
Brian Behlendorf
|
549b3839a8
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-19 11:07:05 -08:00 |
|
Brian Behlendorf
|
826a535491
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:07:01 -08:00 |
|
Brian Behlendorf
|
c2eaf1dcb5
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-19 11:07:00 -08:00 |
|
Brian Behlendorf
|
e799db93d1
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:06:57 -08:00 |
|
Brian Behlendorf
|
390137732f
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-19 11:06:56 -08:00 |
|
Brian Behlendorf
|
ac8b732bce
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:06:52 -08:00 |
|
Brian Behlendorf
|
a8e7c21ad7
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-19 11:06:51 -08:00 |
|
Brian Behlendorf
|
e95501a744
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:06:48 -08:00 |
|
Brian Behlendorf
|
b2bf7106ed
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 11:06:46 -08:00 |
|
Brian Behlendorf
|
4bccf6b2c8
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:06:43 -08:00 |
|
Brian Behlendorf
|
eeccfec33b
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 11:06:42 -08:00 |
|
Brian Behlendorf
|
3556355394
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:06:39 -08:00 |
|
Brian Behlendorf
|
8de27ace20
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-19 11:06:38 -08:00 |
|
Brian Behlendorf
|
ff51b64fde
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:06:34 -08:00 |
|
Brian Behlendorf
|
d5b0e2f5f8
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 11:06:33 -08:00 |
|
Brian Behlendorf
|
f9e908db67
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 11:06:32 -08:00 |
|
Brian Behlendorf
|
9a4b3b10af
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:06:27 -08:00 |
|
Brian Behlendorf
|
f39f71b60c
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-19 11:06:26 -08:00 |
|
Brian Behlendorf
|
e5a6ed971b
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 11:06:25 -08:00 |
|
Brian Behlendorf
|
e8447519d8
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:06:19 -08:00 |
|
Brian Behlendorf
|
cd8c03b918
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-19 11:06:18 -08:00 |
|
Brian Behlendorf
|
4583d5c015
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:06:15 -08:00 |
|
Brian Behlendorf
|
e26a5f91fc
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-19 11:06:14 -08:00 |
|
Brian Behlendorf
|
cb83a0f8f0
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:06:10 -08:00 |
|
Brian Behlendorf
|
b2a86857a8
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-19 11:06:09 -08:00 |
|
Brian Behlendorf
|
af2599694f
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:06:06 -08:00 |
|
Brian Behlendorf
|
15268640a3
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-19 11:06:05 -08:00 |
|
Brian Behlendorf
|
7930999e3a
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:06:01 -08:00 |