diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-14 18:16:51 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-14 18:16:51 +0200 |
commit | b32e36625b44b5c002c417ab4faf6311258c7671 (patch) | |
tree | 87f91f6f7d9ccb229f9c7613f5411534bd504f5e /staging/lm_sensors/linux_3.0.patch | |
parent | 1a274201c465801ed2271018f426f0eaf7098215 (diff) | |
parent | 35c30674b2b901077a809a6f1d8e5a0115098c8b (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/mplayer2/PKGBUILD
community/pcmanfm/PKGBUILD
extra/liblrdf/PKGBUILD
extra/php-apc/PKGBUILD
extra/sqlite/PKGBUILD
kde-unstable/libkgapi/PKGBUILD
kde-unstable/soprano/PKGBUILD
multilib/lib32-libphobos-ldc/PKGBUILD
multilib/lib32-pixman/PKGBUILD
multilib/lib32-sqlite3/PKGBUILD
Diffstat (limited to 'staging/lm_sensors/linux_3.0.patch')
-rw-r--r-- | staging/lm_sensors/linux_3.0.patch | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/staging/lm_sensors/linux_3.0.patch b/staging/lm_sensors/linux_3.0.patch deleted file mode 100644 index da02a3d49..000000000 --- a/staging/lm_sensors/linux_3.0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- prog/detect/sensors-detect 2011-08-02 10:23:46.000000000 +0200 -+++ prog/detect/sensors-detect 2011-08-02 10:24:04.000000000 +0200 -@@ -2472,7 +2472,7 @@ - - sub initialize_kernel_version - { -- `uname -r` =~ /(\d+)\.(\d+)\.(\d+)(.*)/; -+ `uname -r` =~ /(\d+)\.(\d+)(.*)/; - @kernel_version = ($1, $2, $3, $4); - chomp($kernel_arch = `uname -m`); - |