Brian Behlendorf
|
90ed9826ab
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:08:18 -08:00 |
|
Brian Behlendorf
|
22f583b0f5
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 11:08:17 -08:00 |
|
Brian Behlendorf
|
09de417e20
|
Move #endif up to expose userspace bits
|
2008-12-22 11:01:35 -08:00 |
|
Brian Behlendorf
|
c73c225a4a
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 10:37:37 -08:00 |
|
Brian Behlendorf
|
8126ebe55f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-22 10:37:14 -08:00 |
|
Brian Behlendorf
|
8ad9104988
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-22 10:37:10 -08:00 |
|
Brian Behlendorf
|
5169758856
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 10:37:05 -08:00 |
|
Brian Behlendorf
|
ba2c349faf
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 10:36:56 -08:00 |
|
Brian Behlendorf
|
e0141c82aa
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 10:36:55 -08:00 |
|
Brian Behlendorf
|
6a981c09a5
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 10:36:49 -08:00 |
|
Brian Behlendorf
|
bdbd91fe46
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 10:36:48 -08:00 |
|
Brian Behlendorf
|
9c47372b96
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:36:15 -08:00 |
|
Brian Behlendorf
|
10911f9d71
|
Add missing sources
|
2008-12-22 10:27:41 -08:00 |
|
Brian Behlendorf
|
fc1b3ca740
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 16:35:53 -08:00 |
|
Brian Behlendorf
|
15e778a05c
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-19 16:35:07 -08:00 |
|
Brian Behlendorf
|
8806156f06
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 16:34:57 -08:00 |
|
Brian Behlendorf
|
6fdfd55847
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 16:34:48 -08:00 |
|
Brian Behlendorf
|
07bc9c667e
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 16:34:28 -08:00 |
|
Brian Behlendorf
|
f7b6b1c5c1
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 16:34:27 -08:00 |
|
Brian Behlendorf
|
f677f67130
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-19 16:34:12 -08:00 |
|
Brian Behlendorf
|
cbc70456f1
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 16:34:10 -08:00 |
|
Brian Behlendorf
|
809ca413e5
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:33:03 -08:00 |
|
Brian Behlendorf
|
96813619bf
|
Pull in new background scrubber
|
2008-12-19 16:29:13 -08:00 |
|
Brian Behlendorf
|
6fbf894ec8
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 13:48:40 -08:00 |
|
Brian Behlendorf
|
3aa09f9e0d
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-19 13:48:18 -08:00 |
|
Brian Behlendorf
|
8006f3c239
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 13:48:14 -08:00 |
|
Brian Behlendorf
|
99a14f150c
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 13:48:10 -08:00 |
|
Brian Behlendorf
|
f935667824
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 13:48:01 -08:00 |
|
Brian Behlendorf
|
5ae92c2a3c
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 13:48:00 -08:00 |
|
Brian Behlendorf
|
36f6317537
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-19 13:47:54 -08:00 |
|
Brian Behlendorf
|
5cd3d5fe3f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 13:47:53 -08:00 |
|
Brian Behlendorf
|
fd7ac68c8c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 13:47:22 -08:00 |
|
Brian Behlendorf
|
1b2a1a31bb
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 13:47:20 -08:00 |
|
Brian Behlendorf
|
b5e4bf3731
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 13:47:19 -08:00 |
|
Brian Behlendorf
|
8161b781a1
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-19 13:47:18 -08:00 |
|
Brian Behlendorf
|
89bd2100e7
|
Resolve a few more c90 issues
|
2008-12-19 13:45:24 -08:00 |
|
Brian Behlendorf
|
818edba02c
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-19 13:38:22 -08:00 |
|
Brian Behlendorf
|
add6c31eed
|
Update vdev_disk for in-kernel use
|
2008-12-19 13:34:38 -08:00 |
|
Brian Behlendorf
|
b3fafb4b75
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 12:39:52 -08:00 |
|
Brian Behlendorf
|
385cabaff9
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-19 12:39:11 -08:00 |
|
Brian Behlendorf
|
ca5b279dc4
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 12:39:02 -08:00 |
|
Brian Behlendorf
|
3406c35fda
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 12:38:55 -08:00 |
|
Brian Behlendorf
|
d6bcad3544
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 12:38:40 -08:00 |
|
Brian Behlendorf
|
f53179120a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 12:38:39 -08:00 |
|
Brian Behlendorf
|
2b99cc1a0d
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-19 12:38:27 -08:00 |
|
Brian Behlendorf
|
5f5a7707b5
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 12:38:25 -08:00 |
|
Brian Behlendorf
|
c2d9428f4c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 12:37:22 -08:00 |
|
Brian Behlendorf
|
97818e5e2b
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 12:37:17 -08:00 |
|
Brian Behlendorf
|
459f1388ba
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 12:37:15 -08:00 |
|
Brian Behlendorf
|
87810a7c8b
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-19 12:37:13 -08:00 |
|
Brian Behlendorf
|
93a6c0b0b9
|
Fix c90 for() issue
|
2008-12-19 12:33:22 -08:00 |
|
Brian Behlendorf
|
01a745ee24
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 11:07:14 -08:00 |
|
Brian Behlendorf
|
a8e7c21ad7
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-19 11:06:51 -08:00 |
|
Brian Behlendorf
|
b2bf7106ed
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 11:06:46 -08:00 |
|
Brian Behlendorf
|
eeccfec33b
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 11:06:42 -08:00 |
|
Brian Behlendorf
|
d5b0e2f5f8
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 11:06:33 -08:00 |
|
Brian Behlendorf
|
f9e908db67
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 11:06:32 -08:00 |
|
Brian Behlendorf
|
f39f71b60c
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-19 11:06:26 -08:00 |
|
Brian Behlendorf
|
e5a6ed971b
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 11:06:25 -08:00 |
|
Brian Behlendorf
|
e461d277b9
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:05:52 -08:00 |
|
Brian Behlendorf
|
cc92d6497b
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 11:05:49 -08:00 |
|
Brian Behlendorf
|
d67cf69e08
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 11:05:49 -08:00 |
|
Brian Behlendorf
|
893a49fa9a
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-19 11:05:48 -08:00 |
|
Brian Behlendorf
|
9041f66bad
|
Fix all instances of for (int i;;) {} that were easily found
|
2008-12-19 11:03:54 -08:00 |
|
Brian Behlendorf
|
70a97750bc
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 10:51:30 -08:00 |
|
Brian Behlendorf
|
0938ee26f9
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-19 10:51:08 -08:00 |
|
Brian Behlendorf
|
de6a384c50
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:51:05 -08:00 |
|
Brian Behlendorf
|
525a682d4d
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 10:51:03 -08:00 |
|
Brian Behlendorf
|
91523abfb0
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 10:50:59 -08:00 |
|
Brian Behlendorf
|
38712a11db
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 10:50:50 -08:00 |
|
Brian Behlendorf
|
25585a1884
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 10:50:49 -08:00 |
|
Brian Behlendorf
|
870c514108
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-19 10:50:43 -08:00 |
|
Brian Behlendorf
|
4f5a560334
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 10:50:42 -08:00 |
|
Brian Behlendorf
|
d5eedbcd00
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:50:11 -08:00 |
|
Brian Behlendorf
|
1db27e736e
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 10:50:09 -08:00 |
|
Brian Behlendorf
|
ead0ea6da5
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 10:50:09 -08:00 |
|
Brian Behlendorf
|
d9b08ad01f
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-19 10:50:08 -08:00 |
|
Brian Behlendorf
|
66e0d59024
|
Whoops, add missing j
|
2008-12-19 10:48:11 -08:00 |
|
Brian Behlendorf
|
3f0ec06d17
|
Remove chunk from spa_import_common, readd
|
2008-12-19 10:45:59 -08:00 |
|
Brian Behlendorf
|
3d7c44a3de
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 10:37:52 -08:00 |
|
Brian Behlendorf
|
023d652154
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-19 10:37:31 -08:00 |
|
Brian Behlendorf
|
380a9bcd88
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 10:37:26 -08:00 |
|
Brian Behlendorf
|
32d62a53f4
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 10:37:22 -08:00 |
|
Brian Behlendorf
|
7532b57352
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 10:37:14 -08:00 |
|
Brian Behlendorf
|
fd01bfe6b1
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 10:37:13 -08:00 |
|
Brian Behlendorf
|
afacc36f29
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-19 10:37:07 -08:00 |
|
Brian Behlendorf
|
01f8dc1f20
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 10:37:06 -08:00 |
|
Brian Behlendorf
|
b6865ac44a
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:36:36 -08:00 |
|
Brian Behlendorf
|
76247cc21d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 10:36:34 -08:00 |
|
Brian Behlendorf
|
800463b2ef
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 10:36:33 -08:00 |
|
Brian Behlendorf
|
7e159c86a3
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-19 10:36:32 -08:00 |
|
Brian Behlendorf
|
294ebb7537
|
Fix C90 for(int i;;;) compliance issues
|
2008-12-19 10:34:41 -08:00 |
|
Brian Behlendorf
|
eeb4e47031
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 10:27:35 -08:00 |
|
Brian Behlendorf
|
27f8780a37
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-19 10:27:14 -08:00 |
|
Brian Behlendorf
|
9cccccce7c
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 10:27:10 -08:00 |
|
Brian Behlendorf
|
6fedd6ca38
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 10:27:06 -08:00 |
|
Brian Behlendorf
|
8985e2430d
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 10:26:57 -08:00 |
|
Brian Behlendorf
|
4ee870c380
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 10:26:57 -08:00 |
|
Brian Behlendorf
|
9a9a66d507
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-19 10:26:51 -08:00 |
|
Brian Behlendorf
|
f1ba2464f9
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 10:26:50 -08:00 |
|
Brian Behlendorf
|
a5e6632531
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:26:20 -08:00 |
|
Brian Behlendorf
|
e3815b6d3f
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 10:26:18 -08:00 |
|
Brian Behlendorf
|
e312737766
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 10:26:18 -08:00 |
|
Brian Behlendorf
|
b66929fe90
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-19 10:26:17 -08:00 |
|
Brian Behlendorf
|
5ee6377759
|
Fix missing void in prototype
|
2008-12-19 10:24:26 -08:00 |
|
Brian Behlendorf
|
0a9ad44fff
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-18 13:53:57 -08:00 |
|
Brian Behlendorf
|
63f8023d96
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-18 13:53:30 -08:00 |
|
Brian Behlendorf
|
e8815843b4
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-18 13:53:25 -08:00 |
|
Brian Behlendorf
|
41aaf052de
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-18 13:53:19 -08:00 |
|
Brian Behlendorf
|
f4f6b1f529
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-18 13:53:09 -08:00 |
|
Brian Behlendorf
|
ecb1da0ac8
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-18 13:53:08 -08:00 |
|
Brian Behlendorf
|
1bf7e13e78
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-18 13:53:00 -08:00 |
|
Brian Behlendorf
|
ef0739a21d
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 13:52:59 -08:00 |
|
Brian Behlendorf
|
22a4ca8484
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:52:21 -08:00 |
|
Brian Behlendorf
|
433b5c8023
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 13:52:17 -08:00 |
|
Brian Behlendorf
|
93bc33a39e
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-18 13:52:16 -08:00 |
|
Brian Behlendorf
|
23e30eeec9
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-18 13:52:15 -08:00 |
|
Brian Behlendorf
|
6cccf01d35
|
Missed needed drc var
|
2008-12-18 13:50:12 -08:00 |
|
Brian Behlendorf
|
2f10910f57
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-18 13:44:51 -08:00 |
|
Brian Behlendorf
|
5200db236f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-18 13:44:26 -08:00 |
|
Brian Behlendorf
|
c20b05ba8f
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-18 13:44:21 -08:00 |
|
Brian Behlendorf
|
97e1edd90d
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-18 13:44:16 -08:00 |
|
Brian Behlendorf
|
c513e66884
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-18 13:44:06 -08:00 |
|
Brian Behlendorf
|
360d4841e7
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-18 13:44:05 -08:00 |
|
Brian Behlendorf
|
bc05eda218
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-18 13:43:59 -08:00 |
|
Brian Behlendorf
|
07901e75cc
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 13:43:58 -08:00 |
|
Brian Behlendorf
|
bbd1cc6feb
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:43:23 -08:00 |
|
Brian Behlendorf
|
bab7f42832
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 13:43:20 -08:00 |
|
Brian Behlendorf
|
5ce7826ab4
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-18 13:43:19 -08:00 |
|
Brian Behlendorf
|
732fe6a75f
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-18 13:43:19 -08:00 |
|
Brian Behlendorf
|
973a9d5a79
|
Resolve drr shadow by breaking hunk in to a new function, which is just cleaner anyway
|
2008-12-18 13:41:21 -08:00 |
|
Brian Behlendorf
|
9778e475c5
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-18 13:28:07 -08:00 |
|
Brian Behlendorf
|
651f0337c4
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-18 13:27:42 -08:00 |
|
Brian Behlendorf
|
7c56a7d623
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-18 13:27:37 -08:00 |
|
Brian Behlendorf
|
83b052205b
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-18 13:27:32 -08:00 |
|
Brian Behlendorf
|
a3cbac5278
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-18 13:27:23 -08:00 |
|
Brian Behlendorf
|
a0ba5c46c1
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-18 13:27:22 -08:00 |
|
Brian Behlendorf
|
6ef7594e64
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-18 13:27:15 -08:00 |
|
Brian Behlendorf
|
fea7eb9fe4
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 13:27:14 -08:00 |
|
Brian Behlendorf
|
83e1d2bdbc
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:26:39 -08:00 |
|
Brian Behlendorf
|
1a6091791d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 13:26:36 -08:00 |
|
Brian Behlendorf
|
8f52e45adf
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-18 13:26:35 -08:00 |
|
Brian Behlendorf
|
8eccbd95b9
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-18 13:26:34 -08:00 |
|
Brian Behlendorf
|
163f096cb6
|
Resolve remove shadow, rename to rm
|
2008-12-18 13:24:37 -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
|
b7bc2d2d19
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-18 11:52:32 -08:00 |
|
Brian Behlendorf
|
88e5d1800e
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-18 11:52:27 -08:00 |
|
Brian Behlendorf
|
2bccb1031a
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-18 11:52:22 -08:00 |
|
Brian Behlendorf
|
f94274b339
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-18 11:52:12 -08:00 |
|
Brian Behlendorf
|
ec6250d9eb
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-18 11:52:11 -08:00 |