Merge remote-tracking branch 'upstream/master' into openelec-linux-next

This commit is contained in:
Stefan Saraev 2013-03-28 11:48:09 +02:00
commit 907882a40c
3 changed files with 1580 additions and 2 deletions

File diff suppressed because it is too large Load Diff

View File

@ -887,7 +887,7 @@ CONFIG_FEATURE_MIME_CHARSET=""
# Process Utilities
#
CONFIG_IOSTAT=y
# CONFIG_LSOF is not set
CONFIG_LSOF=y
CONFIG_MPSTAT=y
# CONFIG_NMETER is not set
CONFIG_PMAP=y
@ -923,7 +923,7 @@ CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
CONFIG_RENICE=y
CONFIG_BB_SYSCTL=y
CONFIG_FEATURE_SHOW_THREADS=y
# CONFIG_WATCH is not set
CONFIG_WATCH=y
#
# Runit Utilities

View File

@ -24,6 +24,7 @@ Section "Screen"
Option "ColorRange" "Full"
Option "ColorSpace" "RGB"
Option "TVStandard" "HD1080i"
Option "MetaModes" "DFP: 1920x1080; DFP: nvidia-auto-select; TV: 1280x720; TV: nvidia-auto-select"
SubSection "Display"
Depth 24
EndSubSection