Brian Behlendorf
|
4076baaddc
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:37:17 -08:00 |
|
Brian Behlendorf
|
accc1cd03f
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-15 16:37:12 -08:00 |
|
Brian Behlendorf
|
930fdf7e61
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:37:05 -08:00 |
|
Brian Behlendorf
|
682105e5a1
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-15 16:37:02 -08:00 |
|
Brian Behlendorf
|
c9c4efc6b9
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:36:54 -08:00 |
|
Brian Behlendorf
|
9879c22fbd
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-15 16:36:50 -08:00 |
|
Brian Behlendorf
|
08be2f5633
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:36:42 -08:00 |
|
Brian Behlendorf
|
15506fc558
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-15 16:36:39 -08:00 |
|
Brian Behlendorf
|
2b843e0065
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:36:32 -08:00 |
|
Brian Behlendorf
|
00f13fdfda
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-15 16:36:28 -08:00 |
|
Brian Behlendorf
|
9df0130b60
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:36:20 -08:00 |
|
Brian Behlendorf
|
971caea159
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-15 16:36:16 -08:00 |
|
Brian Behlendorf
|
67ef50a7f2
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:36:09 -08:00 |
|
Brian Behlendorf
|
418a6d4a31
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-15 16:36:05 -08:00 |
|
Brian Behlendorf
|
3a68a30b10
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:35:57 -08:00 |
|
Brian Behlendorf
|
02f9655041
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-15 16:35:53 -08:00 |
|
Brian Behlendorf
|
5e78680e5d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-15 16:35:51 -08:00 |
|
Brian Behlendorf
|
64f3f5bd48
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:35:39 -08:00 |
|
Brian Behlendorf
|
5279cd9c18
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-15 16:35:35 -08:00 |
|
Brian Behlendorf
|
5b92804928
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-15 16:35:33 -08:00 |
|
Brian Behlendorf
|
e0481c4c63
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:35:21 -08:00 |
|
Brian Behlendorf
|
e65080d8da
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-15 16:35:18 -08:00 |
|
Brian Behlendorf
|
be1621eda4
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:35:12 -08:00 |
|
Brian Behlendorf
|
ae47c7cbd3
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-15 16:35:09 -08:00 |
|
Brian Behlendorf
|
c02b45f523
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:35:02 -08:00 |
|
Brian Behlendorf
|
c798730bdd
|
Conflict
|
2008-12-15 16:34:48 -08:00 |
|
Brian Behlendorf
|
aeccffa60a
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:34:19 -08:00 |
|
Brian Behlendorf
|
8eb45c659e
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-15 16:34:17 -08:00 |
|
Brian Behlendorf
|
833ec73e37
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:34:11 -08:00 |
|
Brian Behlendorf
|
1bea130dbf
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-15 16:34:09 -08:00 |
|
Brian Behlendorf
|
1b93559482
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:34:02 -08:00 |
|
Brian Behlendorf
|
845fdb4b57
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-15 16:33:58 -08:00 |
|
Brian Behlendorf
|
36be615cc3
|
Conflict
|
2008-12-15 16:32:33 -08:00 |
|
Brian Behlendorf
|
2eae99e9eb
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-15 16:31:30 -08:00 |
|
Brian Behlendorf
|
2712912cb8
|
Use old autoconf stratagy
|
2008-12-15 16:27:22 -08:00 |
|
Brian Behlendorf
|
67ff84aba7
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-15 10:58:24 -08:00 |
|
Brian Behlendorf
|
3ae13f718f
|
Resolve conflict
|
2008-12-15 10:57:47 -08:00 |
|
Brian Behlendorf
|
06418073d4
|
Move libefi check to libefi topic branch
|
2008-12-15 10:54:53 -08:00 |
|
Brian Behlendorf
|
acbd6827fe
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-15 10:52:00 -08:00 |
|
Brian Behlendorf
|
1fbf3f3c97
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:51:59 -08:00 |
|
Brian Behlendorf
|
d43dd792fe
|
Fixing user config
|
2008-12-15 10:50:06 -08:00 |
|
Brian Behlendorf
|
6e15c06292
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-15 10:47:29 -08:00 |
|
Brian Behlendorf
|
b7f7d8e06a
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:47:28 -08:00 |
|
Brian Behlendorf
|
ce1541961c
|
Resolve context
|
2008-12-15 10:47:24 -08:00 |
|
Brian Behlendorf
|
08e26341a4
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:46:31 -08:00 |
|
Brian Behlendorf
|
6661907d23
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-15 10:46:30 -08:00 |
|
Brian Behlendorf
|
c543b4ec69
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:46:27 -08:00 |
|
Brian Behlendorf
|
df233ea16e
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-15 10:46:25 -08:00 |
|
Brian Behlendorf
|
b4c44a2119
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:46:22 -08:00 |
|
Brian Behlendorf
|
10a221262d
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-15 10:46:21 -08:00 |