Brian Behlendorf
|
f2e44250e6
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2008-11-24 11:59:36 -08:00 |
|
Brian Behlendorf
|
6882c80b51
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2008-11-24 11:59:35 -08:00 |
|
Brian Behlendorf
|
2a9adf01f9
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2008-11-24 11:59:34 -08:00 |
|
Brian Behlendorf
|
536640fe29
|
Minor autoconf build fixes:
Fixed BUILDDIR in config/*
Added missing " to ZFS_AC_SCRIPT_CONFIG macro
Removed autoconf/Makefile
|
2008-11-24 11:56:48 -08:00 |
|
Brian Behlendorf
|
a1c5e8a6f0
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-11-24 11:32:14 -08:00 |
|
Brian Behlendorf
|
adc90b459b
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-11-24 11:32:09 -08:00 |
|
Brian Behlendorf
|
4bafca399b
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-11-24 11:32:05 -08:00 |
|
Brian Behlendorf
|
086db132f2
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-11-24 11:32:04 -08:00 |
|
Brian Behlendorf
|
4a36268459
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-11-24 11:31:57 -08:00 |
|
Brian Behlendorf
|
9c44058f0b
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-11-24 11:31:53 -08:00 |
|
Brian Behlendorf
|
76bcba689d
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-11-24 11:31:49 -08:00 |
|
Brian Behlendorf
|
200316f2eb
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-11-24 11:31:45 -08:00 |
|
Brian Behlendorf
|
a9dfcb849e
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-11-24 11:31:41 -08:00 |
|
Brian Behlendorf
|
1d86ff164c
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-11-24 11:31:36 -08:00 |
|
Brian Behlendorf
|
74776b7a84
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-11-24 11:31:32 -08:00 |
|
Brian Behlendorf
|
caadc6e57c
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-11-24 11:31:24 -08:00 |
|
Brian Behlendorf
|
c623b28010
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-11-24 11:31:19 -08:00 |
|
Brian Behlendorf
|
e3f43054db
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-11-24 11:31:15 -08:00 |
|
Brian Behlendorf
|
281598b227
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-11-24 11:31:11 -08:00 |
|
Brian Behlendorf
|
f5cab900e8
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-11-24 11:31:02 -08:00 |
|
Brian Behlendorf
|
8f496fe929
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-11-24 11:30:57 -08:00 |
|
Brian Behlendorf
|
1f85a53579
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-11-24 11:30:57 -08:00 |
|
Brian Behlendorf
|
42911815d3
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-11-24 11:30:56 -08:00 |
|
Brian Behlendorf
|
312dcdbe88
|
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
|
2008-11-24 11:30:56 -08:00 |
|
Brian Behlendorf
|
cb38dc449b
|
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
|
2008-11-24 11:30:55 -08:00 |
|
Brian Behlendorf
|
bb5f033b31
|
Merge commit 'refs/top-bases/gcc-no-pragmas' into gcc-no-pragmas
|
2008-11-24 11:30:53 -08:00 |
|
Brian Behlendorf
|
0d5131ef9c
|
Merge branch 'gcc-no-pragmas' into refs/top-bases/gcc-branch
|
2008-11-24 11:30:53 -08:00 |
|
Brian Behlendorf
|
174b1804a8
|
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
|
2008-11-24 11:30:51 -08:00 |
|
Brian Behlendorf
|
d01c6f9657
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2008-11-24 11:30:50 -08:00 |
|
Brian Behlendorf
|
dd6ef00e58
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-11-24 11:30:48 -08:00 |
|
Brian Behlendorf
|
642a19c3c5
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-11-24 11:30:47 -08:00 |
|
Brian Behlendorf
|
da19a4812d
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-11-24 11:30:46 -08:00 |
|
Brian Behlendorf
|
bb2649e9c4
|
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
|
2008-11-24 11:30:45 -08:00 |
|
Brian Behlendorf
|
b707b0de1c
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-11-24 11:30:43 -08:00 |
|
Brian Behlendorf
|
e296221930
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2008-11-24 11:30:42 -08:00 |
|
Brian Behlendorf
|
b0bb96eae3
|
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
|
2008-11-24 11:30:41 -08:00 |
|
Brian Behlendorf
|
46bd70ad77
|
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
|
2008-11-24 11:30:40 -08:00 |
|
Brian Behlendorf
|
474c17d487
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2008-11-24 11:30:38 -08:00 |
|
Brian Behlendorf
|
142c750de6
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
|
2008-11-24 11:30:37 -08:00 |
|
Brian Behlendorf
|
c3952b5127
|
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
|
2008-11-24 11:30:36 -08:00 |
|
Brian Behlendorf
|
cd2d24d0b3
|
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
|
2008-11-24 11:30:35 -08:00 |
|
Brian Behlendorf
|
21cdf5ab40
|
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
|
2008-11-24 11:30:33 -08:00 |
|
Brian Behlendorf
|
ec85986c50
|
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
|
2008-11-24 11:30:32 -08:00 |
|
Brian Behlendorf
|
3c680e5665
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-11-24 11:30:30 -08:00 |
|
Brian Behlendorf
|
a648ed6fb0
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-11-24 11:30:29 -08:00 |
|
Brian Behlendorf
|
e5a5166978
|
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
|
2008-11-24 11:30:28 -08:00 |
|
Brian Behlendorf
|
1c8adc3723
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-11-24 11:30:28 -08:00 |
|
Brian Behlendorf
|
f5e9b5eba5
|
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
|
2008-11-24 11:30:27 -08:00 |
|
Brian Behlendorf
|
cc81270bf1
|
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
|
2008-11-24 11:30:27 -08:00 |
|
Brian Behlendorf
|
40f646bf50
|
Merge branch 'fix-zio-thread-names' into refs/top-bases/fix-branch
|
2008-11-24 11:30:26 -08:00 |
|