core/linux-wandboard to 3.0.35-7, fix conflicts

core/linux-wandboard/PKGBUILD

@@ -8,7 +8,7 @@ _srcname=linux-3.0.35
 _kernelname=${pkgbase#linux}
 _desc="i.MX6 Wandboard"
 pkgver=3.0.35
-pkgrel=6
+pkgrel=7
 rcnrel=wand6
 arch=('armv7h')
 url="http://www.kernel.org/"
@@ -76,7 +76,7 @@ _package() {
   depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
   provides=('kernel26' "linux=${pkgver}")
-  conflicts=('linux-imx6' 'linux-armv7')
+  conflicts=('linux')
   install=${pkgname}.install
 
   cd "${srcdir}/${_srcname}"
@@ -121,7 +121,7 @@ _package() {
 _package-headers() {
   pkgdesc="Header files and scripts for building modules for linux kernel - ${_desc}"
   provides=("linux-headers=${pkgver}")
-  conflicts=('linux-headers-imx6' 'linux-armv7-headers')
+  conflicts=('linux-headers')
 
   install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"