Brian Behlendorf
|
a73ea13c46
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:29:58 -08:00 |
|
Brian Behlendorf
|
34400b18ba
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-12 14:29:57 -08:00 |
|
Brian Behlendorf
|
394a1fcbb9
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:29:54 -08:00 |
|
Brian Behlendorf
|
cea7f8be31
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-12 14:29:53 -08:00 |
|
Brian Behlendorf
|
c2c2917b9e
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:29:49 -08:00 |
|
Brian Behlendorf
|
eb18d4f4b2
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 14:29:48 -08:00 |
|
Brian Behlendorf
|
a4b7484a8b
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:29:45 -08:00 |
|
Brian Behlendorf
|
59af9d5f3d
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 14:29:44 -08:00 |
|
Brian Behlendorf
|
92cac55e86
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:29:41 -08:00 |
|
Brian Behlendorf
|
a7450f7d3e
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 14:29:40 -08:00 |
|
Brian Behlendorf
|
af50823fa3
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:29:37 -08:00 |
|
Brian Behlendorf
|
4b2b704c5d
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 14:29:35 -08:00 |
|
Brian Behlendorf
|
19ce5ada17
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 14:29:35 -08:00 |
|
Brian Behlendorf
|
d4d4dc4853
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:29:30 -08:00 |
|
Brian Behlendorf
|
4c45a9bd2e
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-12 14:29:28 -08:00 |
|
Brian Behlendorf
|
bb4f48461e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 14:29:28 -08:00 |
|
Brian Behlendorf
|
f12d99e3ab
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:29:22 -08:00 |
|
Brian Behlendorf
|
1cac8533a1
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 14:29:21 -08:00 |
|
Brian Behlendorf
|
36161c3882
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:29:18 -08:00 |
|
Brian Behlendorf
|
d182509998
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-12 14:29:17 -08:00 |
|
Brian Behlendorf
|
c3e8e9ecdc
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:29:14 -08:00 |
|
Brian Behlendorf
|
73b709fa62
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 14:29:12 -08:00 |
|
Brian Behlendorf
|
001d1ddb54
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:29:09 -08:00 |
|
Brian Behlendorf
|
c108b95a5f
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-12 14:29:08 -08:00 |
|
Brian Behlendorf
|
49c8f1e1d9
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:29:05 -08:00 |
|
Brian Behlendorf
|
a22f0913a6
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-12 14:29:04 -08:00 |
|
Brian Behlendorf
|
b9a42bb02a
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:29:01 -08:00 |
|
Brian Behlendorf
|
07122a3b4a
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-12 14:28:59 -08:00 |
|
Brian Behlendorf
|
00fa98c5cf
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:28:56 -08:00 |
|
Brian Behlendorf
|
1d20aa29d5
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-12 14:28:55 -08:00 |
|
Brian Behlendorf
|
50532fe67b
|
Refresh Makefile
|
2008-12-12 14:27:04 -08:00 |
|
Brian Behlendorf
|
2051c5740b
|
Refresh Makefile
|
2008-12-12 14:26:14 -08:00 |
|
Brian Behlendorf
|
1219884686
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:22:28 -08:00 |
|
Brian Behlendorf
|
e0db7f116d
|
Resolve conflict
|
2008-12-12 14:22:23 -08:00 |
|
Brian Behlendorf
|
b3606e56db
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:21:52 -08:00 |
|
Brian Behlendorf
|
ce15032d4f
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-12 14:21:51 -08:00 |
|
Brian Behlendorf
|
c278d333ac
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:21:48 -08:00 |
|
Brian Behlendorf
|
712ecbdc1c
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 14:21:47 -08:00 |
|
Brian Behlendorf
|
14ddcd0b5e
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:21:44 -08:00 |
|
Brian Behlendorf
|
611af8dcda
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-12 14:21:43 -08:00 |
|
Brian Behlendorf
|
251a1c4f2a
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:21:39 -08:00 |
|
Brian Behlendorf
|
a404fc40d4
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-12 14:21:38 -08:00 |
|
Brian Behlendorf
|
f95ca18b30
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:21:35 -08:00 |
|
Brian Behlendorf
|
b0739044fe
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-12 14:21:34 -08:00 |
|
Brian Behlendorf
|
e420ed24df
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:21:31 -08:00 |
|
Brian Behlendorf
|
fb1da23066
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-12 14:21:29 -08:00 |
|
Brian Behlendorf
|
f2a7724084
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:21:25 -08:00 |
|
Brian Behlendorf
|
0adbfd4cfb
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 14:21:24 -08:00 |
|
Brian Behlendorf
|
49a975f0d0
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:21:20 -08:00 |
|
Brian Behlendorf
|
bc55a1e29b
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 14:21:19 -08:00 |