diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-03 19:44:19 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-03 19:44:19 -0300 |
| commit | 5f03f36a1327a1c1ade065b89ec2ad873b708a0d (patch) | |
| tree | 0bbfab5010c0318a1faa46d5897fd831e0e4d60c /libre/linux-libre | |
| parent | 1ac43f3f1d47a56bbc1564ae7d2fd0869f345b6c (diff) | |
| parent | 8eed59114cbcf729b65f87d3f73530f6c8363d20 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/libdvdnav/PKGBUILD
extra/libguess/PKGBUILD
extra/libmowgli/PKGBUILD
extra/xchm/PKGBUILD
libre/linux-libre/PKGBUILD
Diffstat (limited to 'libre/linux-libre')
| -rw-r--r-- | libre/linux-libre/linux-libre.install | 2 | ||||
| -rw-r--r-- | libre/linux-libre/md-raid10-fix-bug-when-activating-a-hot-spare.patch | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 772e15b24..146d349d1 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.1.2-1-LIBRE +KERNEL_VERSION=3.1.4-1-LIBRE post_install () { # updating module dependencies diff --git a/libre/linux-libre/md-raid10-fix-bug-when-activating-a-hot-spare.patch b/libre/linux-libre/md-raid10-fix-bug-when-activating-a-hot-spare.patch index 79be53afb..880849db5 100644 --- a/libre/linux-libre/md-raid10-fix-bug-when-activating-a-hot-spare.patch +++ b/libre/linux-libre/md-raid10-fix-bug-when-activating-a-hot-spare.patch @@ -38,4 +38,3 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> continue; disk_stack_limits(mddev->gendisk, rdev->bdev, - |