Brian Behlendorf
|
c290cb527d
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:20:39 -08:00 |
|
Brian Behlendorf
|
570200410e
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-12 14:20:38 -08:00 |
|
Brian Behlendorf
|
2ee3f66f0d
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:20:35 -08:00 |
|
Brian Behlendorf
|
724265224b
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-12 14:20:34 -08:00 |
|
Brian Behlendorf
|
1bbe898289
|
Resolve conflict
|
2008-12-12 14:19:55 -08:00 |
|
Brian Behlendorf
|
d28f2403f2
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-12 14:18:44 -08:00 |
|
Brian Behlendorf
|
5a27f3f0a5
|
Comment out libzpool builds for now
|
2008-12-12 14:16:50 -08:00 |
|
Brian Behlendorf
|
b4f28b84c0
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:08:15 -08:00 |
|
Brian Behlendorf
|
1c38136eed
|
Resolve conflict
|
2008-12-12 14:08:10 -08:00 |
|
Brian Behlendorf
|
525c79811a
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:02:29 -08:00 |
|
Brian Behlendorf
|
6cae844981
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-12 14:02:28 -08:00 |
|
Brian Behlendorf
|
1bdc94bfd3
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:02:25 -08:00 |
|
Brian Behlendorf
|
8429981d4d
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 14:02:24 -08:00 |
|
Brian Behlendorf
|
3a8d9dc4af
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:02:20 -08:00 |
|
Brian Behlendorf
|
1f7220674a
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-12 14:02:19 -08:00 |
|
Brian Behlendorf
|
eaf091a991
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:02:16 -08:00 |
|
Brian Behlendorf
|
4ad6161f1c
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-12 14:02:15 -08:00 |
|
Brian Behlendorf
|
ad390da296
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:02:12 -08:00 |
|
Brian Behlendorf
|
1a42ebb0c1
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-12 14:02:10 -08:00 |
|
Brian Behlendorf
|
373e09f1b8
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:02:07 -08:00 |
|
Brian Behlendorf
|
6687a81391
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-12 14:02:06 -08:00 |
|
Brian Behlendorf
|
e57c876266
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:02:03 -08:00 |
|
Brian Behlendorf
|
231e0793af
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 14:02:02 -08:00 |
|
Brian Behlendorf
|
ec0b7cdb79
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:01:58 -08:00 |
|
Brian Behlendorf
|
d325eac85e
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 14:01:57 -08:00 |
|
Brian Behlendorf
|
165a1c4ea1
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:01:54 -08:00 |
|
Brian Behlendorf
|
4c62027f0f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 14:01:53 -08:00 |
|
Brian Behlendorf
|
28cac2f2b2
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:01:50 -08:00 |
|
Brian Behlendorf
|
c4d2427b6d
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 14:01:49 -08:00 |
|
Brian Behlendorf
|
fda9ee4941
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 14:01:48 -08:00 |
|
Brian Behlendorf
|
1fd1c382aa
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:01:43 -08:00 |
|
Brian Behlendorf
|
d7dd0d77df
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-12 14:01:41 -08:00 |
|
Brian Behlendorf
|
326eb12f28
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 14:01:41 -08:00 |
|
Brian Behlendorf
|
d502bab1e7
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:01:35 -08:00 |
|
Brian Behlendorf
|
a5880e88af
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 14:01:34 -08:00 |
|
Brian Behlendorf
|
4d25ad0066
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:01:31 -08:00 |
|
Brian Behlendorf
|
8b646ed0a3
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-12 14:01:29 -08:00 |
|
Brian Behlendorf
|
a1d31d01f3
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:01:26 -08:00 |
|
Brian Behlendorf
|
f411872648
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 14:01:25 -08:00 |
|
Brian Behlendorf
|
1bc6b30031
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:01:22 -08:00 |
|
Brian Behlendorf
|
698392631d
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-12 14:01:20 -08:00 |
|
Brian Behlendorf
|
bfcd8e994a
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:01:17 -08:00 |
|
Brian Behlendorf
|
0f25c7dddc
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-12 14:01:16 -08:00 |
|
Brian Behlendorf
|
e83ca8bfca
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:01:13 -08:00 |
|
Brian Behlendorf
|
634a98c116
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-12 14:01:12 -08:00 |
|
Brian Behlendorf
|
09f348197e
|
Resolve conflict
|
2008-12-12 14:00:32 -08:00 |
|
Brian Behlendorf
|
b24923979f
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-12 13:59:40 -08:00 |
|
Brian Behlendorf
|
01db09fde5
|
Collapse libzcommon in to libzpool
|
2008-12-12 13:57:47 -08:00 |
|
Brian Behlendorf
|
a4fce46af9
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 13:52:44 -08:00 |
|
Brian Behlendorf
|
d5c06eeec8
|
Revert mutex changes
|
2008-12-12 13:50:45 -08:00 |