Brian Behlendorf
|
d37e671a1d
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-15 10:36:30 -08:00 |
|
Brian Behlendorf
|
eedcea2c84
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:36:29 -08:00 |
|
Brian Behlendorf
|
e46c8e90ef
|
config/user.m4
|
2008-12-15 10:34:33 -08:00 |
|
Brian Behlendorf
|
ffcb9ba45b
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-15 10:31:42 -08:00 |
|
Brian Behlendorf
|
4b0108505a
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:31:41 -08:00 |
|
Brian Behlendorf
|
bf7acdd24c
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-15 10:31:40 -08:00 |
|
Brian Behlendorf
|
dc2e78d88c
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:31:37 -08:00 |
|
Brian Behlendorf
|
6bea798e15
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-15 10:31:35 -08:00 |
|
Brian Behlendorf
|
262c9a6c8d
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:31:32 -08:00 |
|
Brian Behlendorf
|
856399f341
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-15 10:31:30 -08:00 |
|
Brian Behlendorf
|
d1652376b2
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:31:27 -08:00 |
|
Brian Behlendorf
|
8b125c7e0a
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-15 10:31:26 -08:00 |
|
Brian Behlendorf
|
b8645fff03
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:31:22 -08:00 |
|
Brian Behlendorf
|
b554219f17
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-15 10:31:21 -08:00 |
|
Brian Behlendorf
|
937451586c
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:31:18 -08:00 |
|
Brian Behlendorf
|
751db10e66
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-15 10:31:16 -08:00 |
|
Brian Behlendorf
|
dcb4cfcb46
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:31:13 -08:00 |
|
Brian Behlendorf
|
3069810feb
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-15 10:31:11 -08:00 |
|
Brian Behlendorf
|
e77db45191
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:31:08 -08:00 |
|
Brian Behlendorf
|
4e50772973
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-15 10:31:07 -08:00 |
|
Brian Behlendorf
|
791df30ed0
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:31:03 -08:00 |
|
Brian Behlendorf
|
ecf714b3a3
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-15 10:31:02 -08:00 |
|
Brian Behlendorf
|
980d77f9ab
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:30:59 -08:00 |
|
Brian Behlendorf
|
4d14424589
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-15 10:30:57 -08:00 |
|
Brian Behlendorf
|
7685dee9ff
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:30:54 -08:00 |
|
Brian Behlendorf
|
475f668821
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-15 10:30:53 -08:00 |
|
Brian Behlendorf
|
7fa259fa3b
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-15 10:30:52 -08:00 |
|
Brian Behlendorf
|
a855d28a31
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:30:47 -08:00 |
|
Brian Behlendorf
|
b78521e53b
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-15 10:30:45 -08:00 |
|
Brian Behlendorf
|
3677154415
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-15 10:30:45 -08:00 |
|
Brian Behlendorf
|
3db3df28bc
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:30:39 -08:00 |
|
Brian Behlendorf
|
82ecdaf013
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-15 10:30:38 -08:00 |
|
Brian Behlendorf
|
0707019a50
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:30:35 -08:00 |
|
Brian Behlendorf
|
618e24b1a6
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-15 10:30:33 -08:00 |
|
Brian Behlendorf
|
97df215dd9
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:30:30 -08:00 |
|
Brian Behlendorf
|
6f1e9b9047
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-15 10:30:28 -08:00 |
|
Brian Behlendorf
|
28b3d70d42
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:30:25 -08:00 |
|
Brian Behlendorf
|
52c6463fcd
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-15 10:30:23 -08:00 |
|
Brian Behlendorf
|
9922eb50d0
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:30:20 -08:00 |
|
Brian Behlendorf
|
6b077223b1
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-15 10:30:18 -08:00 |
|
Brian Behlendorf
|
37774f4d05
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:30:15 -08:00 |
|
Brian Behlendorf
|
5e007c1c57
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-15 10:30:14 -08:00 |
|
Brian Behlendorf
|
b3b77e63be
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:30:11 -08:00 |
|
Brian Behlendorf
|
89c77388c9
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-15 10:30:09 -08:00 |
|
Brian Behlendorf
|
e631cff898
|
Remove lustre config, we really shouldn't need this. A user space build -should- be able to contain all the needed APIs. If this is not the case we can reintroduce this.
|
2008-12-15 10:28:14 -08:00 |
|
Brian Behlendorf
|
c270be0eef
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-15 10:02:34 -08:00 |
|
Brian Behlendorf
|
617be506e6
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:02:33 -08:00 |
|
Brian Behlendorf
|
5a17b1401d
|
Add unistd.h include config magic
|
2008-12-15 10:00:43 -08:00 |
|
Brian Behlendorf
|
fb4caf020a
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-15 09:36:41 -08:00 |
|
Brian Behlendorf
|
4846f3140a
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 09:36:39 -08:00 |