Brian Behlendorf
|
6e960f5f4a
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-03-12 15:26:16 -07:00 |
|
Brian Behlendorf
|
379d9cf34d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-03-12 15:26:15 -07:00 |
|
Brian Behlendorf
|
6a59551cb7
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-03-12 15:26:13 -07:00 |
|
Brian Behlendorf
|
c4e10eb3df
|
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
|
2009-03-12 15:21:30 -07:00 |
|
Brian Behlendorf
|
21a51bafc8
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-03-12 15:21:30 -07:00 |
|
Brian Behlendorf
|
56aaaa2617
|
New TopGit dependency: fix-strncat
|
2009-03-12 15:21:27 -07:00 |
|
Brian Behlendorf
|
f1f9c50dd9
|
Add fix-strncat branch which corrects a buffer overrun.
|
2009-03-12 15:20:26 -07:00 |
|
Brian Behlendorf
|
723dfc2dd6
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-03-12 15:15:40 -07:00 |
|
Brian Behlendorf
|
2b6d7f8dc0
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-03-12 15:15:38 -07:00 |
|
Brian Behlendorf
|
bd9dd9c1b8
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-03-12 15:15:28 -07:00 |
|
Brian Behlendorf
|
a47a8f2932
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-03-12 15:15:25 -07:00 |
|
Brian Behlendorf
|
9e6ba688ad
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-03-12 15:15:18 -07:00 |
|
Brian Behlendorf
|
39e4615e42
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-03-12 15:15:16 -07:00 |
|
Brian Behlendorf
|
4e4fbfe52c
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-03-12 15:15:10 -07:00 |
|
Brian Behlendorf
|
0a6d02c2b9
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-03-12 15:15:08 -07:00 |
|
Brian Behlendorf
|
32cab3bfcb
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-03-12 15:15:01 -07:00 |
|
Brian Behlendorf
|
80e40a821f
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-03-12 15:14:59 -07:00 |
|
Brian Behlendorf
|
e3bf69ec1c
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-12 15:14:50 -07:00 |
|
Brian Behlendorf
|
cd52c92666
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-03-12 15:14:46 -07:00 |
|
Brian Behlendorf
|
bd3a91c4cc
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-03-12 15:14:40 -07:00 |
|
Brian Behlendorf
|
b9502a9d25
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-03-12 15:14:38 -07:00 |
|
Brian Behlendorf
|
2133407a5a
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-03-12 15:14:32 -07:00 |
|
Brian Behlendorf
|
b0d71d0ee7
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-03-12 15:14:29 -07:00 |
|
Brian Behlendorf
|
74d6156657
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-03-12 15:14:23 -07:00 |
|
Brian Behlendorf
|
de666d0506
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-03-12 15:14:21 -07:00 |
|
Brian Behlendorf
|
3e694ee30f
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-12 15:14:15 -07:00 |
|
Brian Behlendorf
|
2506d4fd15
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-03-12 15:14:10 -07:00 |
|
Brian Behlendorf
|
c6e0d12674
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-03-12 15:14:03 -07:00 |
|
Brian Behlendorf
|
2b38abcd29
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-03-12 15:14:01 -07:00 |
|
Brian Behlendorf
|
31a4c5efb7
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-03-12 15:13:55 -07:00 |
|
Brian Behlendorf
|
b732938291
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-03-12 15:13:53 -07:00 |
|
Brian Behlendorf
|
d5cb00b815
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-03-12 15:13:52 -07:00 |
|
Brian Behlendorf
|
6d9faabdc8
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-03-12 15:13:41 -07:00 |
|
Brian Behlendorf
|
dddfd629a8
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-03-12 15:13:39 -07:00 |
|
Brian Behlendorf
|
224d1bc012
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-12 15:13:35 -07:00 |
|
Brian Behlendorf
|
ac4a40338d
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-03-12 15:13:21 -07:00 |
|
Brian Behlendorf
|
44d1909263
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-03-12 15:13:19 -07:00 |
|
Brian Behlendorf
|
be5b415f7e
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-03-12 15:13:13 -07:00 |
|
Brian Behlendorf
|
9f9dc1dedf
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-03-12 15:13:10 -07:00 |
|
Brian Behlendorf
|
bacb58978d
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-03-12 15:13:04 -07:00 |
|
Brian Behlendorf
|
74a134347a
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-03-12 15:13:02 -07:00 |
|
Brian Behlendorf
|
087bcb48ec
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-03-12 15:12:54 -07:00 |
|
Brian Behlendorf
|
e4c2959728
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-03-12 15:12:49 -07:00 |
|
Brian Behlendorf
|
23d656adeb
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-03-12 15:12:43 -07:00 |
|
Brian Behlendorf
|
4defc1ecfa
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-03-12 15:12:40 -07:00 |
|
Brian Behlendorf
|
4750c97a3f
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-03-12 15:12:34 -07:00 |
|
Brian Behlendorf
|
37370afac3
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-03-12 15:12:32 -07:00 |
|
Brian Behlendorf
|
35b117277d
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-03-12 15:12:26 -07:00 |
|
Brian Behlendorf
|
949f353a63
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-03-12 15:12:23 -07:00 |
|
Brian Behlendorf
|
f2e7d57653
|
Packaging update
Make LINUX_VERSION available to Makefile's, add packaging
for user space include headers.
|
2009-03-12 15:07:29 -07:00 |