Brian Behlendorf
|
97a0b13aec
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-18 13:19:54 -08:00 |
|
Brian Behlendorf
|
632ae68fd3
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:19:50 -08:00 |
|
Brian Behlendorf
|
1f6a2a1743
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-18 13:19:49 -08:00 |
|
Brian Behlendorf
|
b6df558aa9
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:19:45 -08:00 |
|
Brian Behlendorf
|
0beb23495e
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-18 13:19:44 -08:00 |
|
Brian Behlendorf
|
2691212596
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:19:40 -08:00 |
|
Brian Behlendorf
|
dddf2efadf
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-18 13:19:38 -08:00 |
|
Brian Behlendorf
|
b496c9c387
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:19:35 -08:00 |
|
Brian Behlendorf
|
e4f40f34b3
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-18 13:19:33 -08:00 |
|
Brian Behlendorf
|
5578575cdf
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:19:30 -08:00 |
|
Brian Behlendorf
|
7299994fcf
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-18 13:19:28 -08:00 |
|
Brian Behlendorf
|
071c9632b7
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:19:24 -08:00 |
|
Brian Behlendorf
|
1eaa464a82
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-18 13:19:22 -08:00 |
|
Brian Behlendorf
|
600ad1b343
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:19:19 -08:00 |
|
Brian Behlendorf
|
155929dfcd
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-18 13:19:17 -08:00 |
|
Brian Behlendorf
|
2fb7a5bdaa
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:19:14 -08:00 |
|
Brian Behlendorf
|
8a2a1a5b3a
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-18 13:19:12 -08:00 |
|
Brian Behlendorf
|
fb0de6a410
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-18 13:19:11 -08:00 |
|
Brian Behlendorf
|
e01c41b1b7
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:19:06 -08:00 |
|
Brian Behlendorf
|
1ab1ffc591
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-18 13:19:04 -08:00 |
|
Brian Behlendorf
|
e6169bf282
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 13:19:03 -08:00 |
|
Brian Behlendorf
|
6d7aa3662c
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:18:58 -08:00 |
|
Brian Behlendorf
|
1d9d2ce17a
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-18 13:18:56 -08:00 |
|
Brian Behlendorf
|
a0fa317751
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:18:53 -08:00 |
|
Brian Behlendorf
|
47dadfad56
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-18 13:18:51 -08:00 |
|
Brian Behlendorf
|
418ea1fa6f
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:18:48 -08:00 |
|
Brian Behlendorf
|
e55e3643df
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-18 13:18:46 -08:00 |
|
Brian Behlendorf
|
fb2f56b59c
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:18:42 -08:00 |
|
Brian Behlendorf
|
79e327ecd9
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-18 13:18:40 -08:00 |
|
Brian Behlendorf
|
3ffb37747c
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:18:37 -08:00 |
|
Brian Behlendorf
|
ffdb61e499
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-18 13:18:36 -08:00 |
|
Brian Behlendorf
|
2dc73e9e6d
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:18:32 -08:00 |
|
Brian Behlendorf
|
3757e9a877
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-18 13:18:30 -08:00 |
|
Brian Behlendorf
|
da1ceb2bbe
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:18:27 -08:00 |
|
Brian Behlendorf
|
7d7be7c849
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-18 13:18:21 -08:00 |
|
Brian Behlendorf
|
72bf32a79f
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 13:18:19 -08:00 |
|
Brian Behlendorf
|
844a9ced6d
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-18 13:18:17 -08:00 |
|
Brian Behlendorf
|
efd36af3be
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-12-18 13:18:15 -08:00 |
|
Brian Behlendorf
|
33e499be43
|
Merge branch 'fix-stack' into refs/top-bases/fix-branch
|
2008-12-18 13:18:15 -08:00 |
|
Brian Behlendorf
|
8e136cf0c9
|
Add noinline macro for userspace
|
2008-12-18 13:15:58 -08:00 |
|
Brian Behlendorf
|
7f9be4dd4c
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:53:10 -08:00 |
|
Brian Behlendorf
|
426346e025
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-18 11:53:08 -08:00 |
|
Brian Behlendorf
|
4019e93141
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:53:05 -08:00 |
|
Brian Behlendorf
|
3ab6ccb2b4
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-18 11:53:04 -08:00 |
|
Brian Behlendorf
|
0b3615c765
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:53:00 -08:00 |
|
Brian Behlendorf
|
60cb2a1fd5
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-18 11:52:58 -08:00 |
|
Brian Behlendorf
|
2410b33399
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:52:55 -08:00 |
|
Brian Behlendorf
|
1a066ea1a9
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-18 11:52:53 -08:00 |
|
Brian Behlendorf
|
7e55eed6ad
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:52:50 -08:00 |
|
Brian Behlendorf
|
054cf705be
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-18 11:52:48 -08:00 |