service.openelec.settings: update to service.openelec.settings-0.2.16
Revert "libbluray: make AACS support optional, add support to choose between 'libaacs' and 'makemkv-oss' as aacs solution, set default to 'makemkv-oss'"

This reverts commit dec93b479c0feb12fe609c9c500338bfdcbedd5d.
Revert "new package: add package 'makemkv-oss'"

This reverts commit 7513d13bca5d5a4dab0448a53924a3578a244ad5.
xf86-video-ati: cleanup

Signed-off-by: Stephan Raue <stephan@openelec.tv>
config/graphic: enable composite support for ATI OSS graphic drivers

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Revert "eglibc: disable nis"

required for activeperl and there are some people who use it

This reverts commit f254b91c151159d86d986a84a21949825d7a42a5.
linux: update to linux-3.10.13

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xbmc: update to xbmc-12.2-cd71444

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xf86-video-fglrx: fix signature file

Signed-off-by: Stephan Raue <stephan@openelec.tv>
udevil: add mounthelper script

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xf86-video-intel: update to xf86-video-intel-2.99.903

Signed-off-by: Stephan Raue <stephan@openelec.tv>
config/version: set version to 3.2.1

Signed-off-by: Stephan Raue <stephan@openelec.tv>
config/version: set version back to devel

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Revert "bcm2835-bootloader: update to bcm2835-bootloader-86e7643"

This reverts commit b274da62338b66cdf39043b578192291573d7338.
eglibc: fix dns with broken routers

ref #2319
Merge branch 'openelec-3.2' of https://github.com/OpenELEC/OpenELEC.tv into openelec-3.2
linux: keep 3.12-rc2

* 'openelec-3.2' of https://github.com/OpenELEC/OpenELEC.tv:
  config/version: set version back to devel
  config/version: set version to 3.2.1
  xf86-video-intel: update to xf86-video-intel-2.99.903
  udevil: add mounthelper script
  xf86-video-fglrx: fix signature file
  xbmc: update to xbmc-12.2-cd71444
  linux: update to linux-3.10.13
  Revert "eglibc: disable nis"
  config/graphic: enable composite support for ATI OSS graphic drivers
  xf86-video-ati: cleanup
  Revert "new package: add package 'makemkv-oss'"
  Revert "libbluray: make AACS support optional, add support to choose between 'libaacs' and 'makemkv-oss' as aacs solution, set default to 'makemkv-oss'"
  service.openelec.settings: update to service.openelec.settings-0.2.16

Conflicts:
	packages/linux/meta
Merge branch 'openelec-3.2' of https://github.com/OpenELEC/OpenELEC.tv into openelec-3.2

# By Stefan Saraev (1) and Stephan Raue (1)
# Via Stephan Raue
* 'openelec-3.2' of https://github.com/OpenELEC/OpenELEC.tv:
  eglibc: fix dns with broken routers
  Revert "bcm2835-bootloader: update to bcm2835-bootloader-86e7643"
busybox-initramfs: make uvesafb support optional, and use only if needed

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xf86-video-fglrx: provide controlfile from 13.6 to hide the watermark

Signed-off-by: Stephan Raue <stephan@openelec.tv>
linux: 3.12-rc3