Brian Behlendorf
|
0b49ae2d8a
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-03-13 09:23:34 -07:00 |
|
Brian Behlendorf
|
ebc1041a40
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-13 09:23:25 -07:00 |
|
Brian Behlendorf
|
64791580c5
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-03-13 09:23:23 -07:00 |
|
Brian Behlendorf
|
42284243a0
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-03-13 09:23:14 -07:00 |
|
Brian Behlendorf
|
0cf5c0f36e
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-03-13 09:23:12 -07:00 |
|
Brian Behlendorf
|
dc79d6b27c
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-03-13 09:23:00 -07:00 |
|
Brian Behlendorf
|
ee96ac6a5c
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-03-13 09:22:57 -07:00 |
|
Brian Behlendorf
|
a2d616b636
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-03-13 09:22:48 -07:00 |
|
Brian Behlendorf
|
cb3e61b819
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-03-13 09:22:47 -07:00 |
|
Brian Behlendorf
|
4e2f1a80ba
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-13 09:22:37 -07:00 |
|
Brian Behlendorf
|
44e0366120
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-03-13 09:22:36 -07:00 |
|
Brian Behlendorf
|
400c0c2887
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-03-13 09:22:23 -07:00 |
|
Brian Behlendorf
|
a36ec91b58
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-03-13 09:22:22 -07:00 |
|
Brian Behlendorf
|
8b336911ea
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-03-13 09:22:12 -07:00 |
|
Brian Behlendorf
|
ee76c27625
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-03-13 09:22:10 -07:00 |
|
Brian Behlendorf
|
ddcda1190f
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-03-13 09:22:10 -07:00 |
|
Brian Behlendorf
|
a48f08e335
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-03-13 09:21:52 -07:00 |
|
Brian Behlendorf
|
ed645bf45e
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-03-13 09:21:48 -07:00 |
|
Brian Behlendorf
|
cdcd962458
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-13 09:21:47 -07:00 |
|
Brian Behlendorf
|
5376664a25
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-03-13 09:21:30 -07:00 |
|
Brian Behlendorf
|
89637aca35
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-03-13 09:21:28 -07:00 |
|
Brian Behlendorf
|
1e8aab4a4f
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-03-13 09:21:16 -07:00 |
|
Brian Behlendorf
|
6c55a38339
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-03-13 09:21:13 -07:00 |
|
Brian Behlendorf
|
c027c02c9a
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-03-13 09:21:04 -07:00 |
|
Brian Behlendorf
|
e2f3707a0d
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-03-13 09:21:00 -07:00 |
|
Brian Behlendorf
|
9968df1372
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-03-13 09:20:51 -07:00 |
|
Brian Behlendorf
|
309b492761
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-03-13 09:20:48 -07:00 |
|
Brian Behlendorf
|
abdbceb2be
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-03-13 09:20:38 -07:00 |
|
Brian Behlendorf
|
5ef9374d10
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-03-13 09:20:36 -07:00 |
|
Brian Behlendorf
|
336f4d49db
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-03-13 09:20:26 -07:00 |
|
Brian Behlendorf
|
9ef8a156d7
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-03-13 09:20:24 -07:00 |
|
Brian Behlendorf
|
4b3bfea82d
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-03-13 09:20:15 -07:00 |
|
Brian Behlendorf
|
2c7a1aa9e1
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-03-13 09:20:06 -07:00 |
|
Brian Behlendorf
|
ede91ec061
|
Add --copy to automake to break configure phase dependency on automake.
|
2009-03-13 09:11:44 -07:00 |
|
Brian Behlendorf
|
80f75f6e28
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-03-12 17:21:45 -07:00 |
|
Brian Behlendorf
|
0b4bab6bf6
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-03-12 17:21:43 -07:00 |
|
Brian Behlendorf
|
83be3876ce
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-03-12 17:21:36 -07:00 |
|
Brian Behlendorf
|
f6f94d1cf8
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-03-12 17:21:33 -07:00 |
|
Brian Behlendorf
|
c2b4bd64f4
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-03-12 17:21:26 -07:00 |
|
Brian Behlendorf
|
c243550ae6
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-03-12 17:21:23 -07:00 |
|
Brian Behlendorf
|
a2b8781f62
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-03-12 17:21:17 -07:00 |
|
Brian Behlendorf
|
d41c591871
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-03-12 17:21:15 -07:00 |
|
Brian Behlendorf
|
f28f21e4cb
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-03-12 17:21:08 -07:00 |
|
Brian Behlendorf
|
496754e5b9
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-03-12 17:21:05 -07:00 |
|
Brian Behlendorf
|
3be22df096
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-12 17:20:57 -07:00 |
|
Brian Behlendorf
|
642d60f1fc
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-03-12 17:20:54 -07:00 |
|
Brian Behlendorf
|
695696a7b2
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-03-12 17:20:48 -07:00 |
|
Brian Behlendorf
|
634b508b2d
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-03-12 17:20:45 -07:00 |
|
Brian Behlendorf
|
d9d470c219
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-03-12 17:20:39 -07:00 |
|
Brian Behlendorf
|
704cdf9159
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-03-12 17:20:36 -07:00 |