Merge branch 'sh/cachetlb' into sh-fixes-for-linus

The representation of the above is reflected in the directory tree

in EDAC's sysfs interface. Starting in directory

/sys/devices/system/edac/mc each memory controller will be represented

by its own 'mcX' directory, where 'X" is the index of the MC.

by its own 'mcX' directory, where 'X' is the index of the MC.

	..../edac/mc/

		   ....

Under each 'mcX' directory each 'csrowX' is again represented by a

'csrowX', where 'X" is the csrow index:

'csrowX', where 'X' is the csrow index:

	.../mc/mc0/

In 'mcX' directories are EDAC control and attribute files for

this 'X" instance of the memory controllers:

this 'X' instance of the memory controllers:

Counter reset control file:

'csrowX' DIRECTORIES

In the 'csrowX' directories are EDAC control and attribute files for

this 'X" instance of csrow:

this 'X' instance of csrow:

Total Uncorrectable Errors count attribute file:

	Count buffering overhead as bytes/2^tcp_adv_win_scale

	(if tcp_adv_win_scale > 0) or bytes-bytes/2^(-tcp_adv_win_scale),

	if it is <= 0.

	Possible values are [-31, 31], inclusive.

	Default: 2

tcp_allowed_congestion_control - STRING

VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 37

EXTRAVERSION = -rc3

EXTRAVERSION = -rc4

NAME = Flesh-Eating Bats with Fangs

# *DOCUMENTATION*

CONFIG_EXPERIMENTAL=y

# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_IKCONFIG=m

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_EMBEDDED=y

# CONFIG_KALLSYMS is not set

CONFIG_SLAB=y

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_MODULES=y

CONFIG_MODULE_FORCE_LOAD=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_IOSCHED_DEADLINE is not set

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_AT91=y

CONFIG_MACH_ONEARM=y

CONFIG_ARCH_AT91RM9200DK=y

CONFIG_MACH_AT91RM9200EK=y

CONFIG_MACH_CSB337=y

CONFIG_MACH_CSB637=y

CONFIG_MACH_CARMEVA=y

CONFIG_MACH_ATEB9200=y

CONFIG_MACH_KB9200=y

CONFIG_MACH_PICOTUX2XX=y

CONFIG_MACH_KAFA=y

CONFIG_MACH_ECBAT91=y

CONFIG_MACH_YL9200=y

CONFIG_MACH_CPUAT91=y

CONFIG_MACH_ECO920=y

CONFIG_MTD_AT91_DATAFLASH_CARD=y

CONFIG_AT91_PROGRAMMABLE_CLOCKS=y

CONFIG_AT91_TIMER_HZ=100

# CONFIG_ARM_THUMB is not set

CONFIG_PCCARD=y

CONFIG_AT91_CF=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_LEDS=y

CONFIG_LEDS_CPU=y

CONFIG_ZBOOT_ROM_TEXT=0x10000000

CONFIG_ZBOOT_ROM_BSS=0x20040000

CONFIG_KEXEC=y

CONFIG_FPE_NWFPE=y

CONFIG_BINFMT_MISC=m

CONFIG_BINFMT_MISC=y

CONFIG_NET=y

CONFIG_PACKET=m

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=m

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_NET_IPIP=m

CONFIG_NET_IPGRE=m

CONFIG_INET_XFRM_MODE_TRANSPORT=m

CONFIG_INET_XFRM_MODE_TUNNEL=m

CONFIG_INET_XFRM_MODE_BEET=m

CONFIG_INET_DIAG=m

CONFIG_IPV6_PRIVACY=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y

CONFIG_BT_BNEP_MC_FILTER=y

CONFIG_BT_BNEP_PROTO_FILTER=y

CONFIG_BT_HIDP=m

CONFIG_FW_LOADER=m

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_MTD=y

CONFIG_MTD_CONCAT=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_AFS_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_JEDECPROBE=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_COMPLEX_MAPPINGS=y

CONFIG_MTD_PHYSMAP=y

CONFIG_BLK_DEV_LOOP=m

CONFIG_MTD_PLATRAM=y

CONFIG_MTD_DATAFLASH=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_ATMEL=y

CONFIG_MTD_NAND_PLATFORM=y

CONFIG_MTD_UBI=y

CONFIG_MTD_UBI_GLUEBI=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_NBD=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_ATMEL_TCLIB=y

CONFIG_EEPROM_LEGACY=m

CONFIG_SCSI=m

CONFIG_BLK_DEV_SD=m

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_BLK_DEV_SR=m

CONFIG_BLK_DEV_SR_VENDOR=y

CONFIG_CHR_DEV_SG=m

CONFIG_SCSI_MULTI_LUN=y

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_NETDEVICES=y

CONFIG_TUN=m

CONFIG_PHYLIB=y

CONFIG_DAVICOM_PHY=y

CONFIG_SMSC_PHY=y

CONFIG_MICREL_PHY=y

CONFIG_NET_ETHERNET=y

CONFIG_ARM_AT91_ETHER=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

CONFIG_USB_CATC=m

CONFIG_USB_KAWETH=m

CONFIG_USB_PEGASUS=m

CONFIG_USB_NET_DM9601=m

CONFIG_USB_NET_GL620A=m

CONFIG_USB_NET_PLUSB=m

CONFIG_USB_NET_MCS7830=m

CONFIG_USB_NET_RNDIS_HOST=m

CONFIG_USB_ALI_M5632=y

CONFIG_USB_AN2720=y

CONFIG_USB_EPSON2888=y

CONFIG_USB_KC2190=y

CONFIG_PPP=m

CONFIG_PPP=y

CONFIG_PPP_MULTILINK=y

CONFIG_PPP_FILTER=y

CONFIG_PPP_ASYNC=m

CONFIG_PPP_DEFLATE=m

CONFIG_PPP_BSDCOMP=m

CONFIG_PPP_ASYNC=y

CONFIG_PPP_DEFLATE=y

CONFIG_PPP_BSDCOMP=y

CONFIG_PPP_MPPE=m

CONFIG_PPPOE=m

CONFIG_SLIP=m

CONFIG_SLIP_COMPRESSED=y

CONFIG_SLIP_SMART=y

CONFIG_SLIP_MODE_SLIP6=y

# CONFIG_INPUT_MOUSEDEV is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_MOUSEDEV_SCREEN_X=640

CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_SERIAL_ATMEL=y

CONFIG_SERIAL_ATMEL_CONSOLE=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_I2C=m

CONFIG_I2C_CHARDEV=m

CONFIG_I2C_GPIO=m

CONFIG_LEGACY_PTY_COUNT=32

CONFIG_HW_RANDOM=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_GPIO=y

CONFIG_SPI=y

CONFIG_SPI_ATMEL=y

CONFIG_SPI_BITBANG=y

CONFIG_GPIO_SYSFS=y

CONFIG_HWMON=m

CONFIG_SENSORS_ADM1021=m

CONFIG_SENSORS_ADM1025=m

CONFIG_SENSORS_GL520SM=m

CONFIG_SENSORS_IT87=m

CONFIG_SENSORS_LM63=m

CONFIG_SENSORS_LM73=m

CONFIG_SENSORS_LM75=m

CONFIG_SENSORS_LM77=m

CONFIG_SENSORS_LM78=m

CONFIG_SENSORS_W83L785TS=m

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_AT91RM9200_WATCHDOG=m

CONFIG_HID=m

CONFIG_USB=m

CONFIG_AT91RM9200_WATCHDOG=y

CONFIG_FB=y

CONFIG_FB_MODE_HELPERS=y

CONFIG_FB_TILEBLITTING=y

CONFIG_FB_S1D13XXX=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

# CONFIG_BACKLIGHT_GENERIC is not set

CONFIG_DISPLAY_SUPPORT=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FONTS=y

CONFIG_FONT_MINI_4x6=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

# CONFIG_LOGO_LINUX_VGA16 is not set

CONFIG_USB=y

CONFIG_USB_DEVICEFS=y

CONFIG_USB_OHCI_HCD=m

# CONFIG_USB_DEVICE_CLASS is not set

CONFIG_USB_MON=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_ACM=m

CONFIG_USB_PRINTER=m

CONFIG_USB_STORAGE=m

CONFIG_USB_SERIAL=m

CONFIG_USB_STORAGE=y

CONFIG_USB_SERIAL=y

CONFIG_USB_SERIAL_CONSOLE=y

CONFIG_USB_SERIAL_GENERIC=y

CONFIG_USB_SERIAL_PL2303=m

CONFIG_MMC=m

CONFIG_MMC_AT91=m

CONFIG_RTC_CLASS=m

CONFIG_RTC_DRV_AT91RM9200=m

CONFIG_EXT2_FS=m

CONFIG_EXT3_FS=m

CONFIG_USB_SERIAL_FTDI_SIO=y

CONFIG_USB_SERIAL_KEYSPAN=y

CONFIG_USB_SERIAL_KEYSPAN_MPR=y

CONFIG_USB_SERIAL_KEYSPAN_USA28=y

CONFIG_USB_SERIAL_KEYSPAN_USA28X=y

CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y

CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y

CONFIG_USB_SERIAL_KEYSPAN_USA19=y

CONFIG_USB_SERIAL_KEYSPAN_USA18X=y

CONFIG_USB_SERIAL_KEYSPAN_USA19W=y

CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y

CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y

CONFIG_USB_SERIAL_KEYSPAN_USA49W=y

CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y

CONFIG_USB_SERIAL_MCT_U232=y

CONFIG_USB_SERIAL_PL2303=y

CONFIG_USB_GADGET=y

CONFIG_USB_ETH=m

CONFIG_USB_MASS_STORAGE=m

CONFIG_MMC=y

CONFIG_MMC_AT91=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_GPIO=y

CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

CONFIG_RTC_CLASS=y

# CONFIG_RTC_HCTOSYS is not set

CONFIG_RTC_DRV_DS1307=y

CONFIG_RTC_DRV_PCF8563=y

CONFIG_RTC_DRV_AT91RM9200=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_FS_XATTR is not set

CONFIG_INOTIFY=y

CONFIG_ISO9660_FS=m

CONFIG_REISERFS_FS=y

CONFIG_AUTOFS4_FS=y

CONFIG_ISO9660_FS=y

CONFIG_JOLIET=y

CONFIG_UDF_FS=m

CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=m

CONFIG_ZISOFS=y

CONFIG_UDF_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_NTFS_FS=m

CONFIG_TMPFS=y

CONFIG_CONFIGFS_FS=y

CONFIG_JFFS2_FS=y

CONFIG_JFFS2_SUMMARY=y

CONFIG_JFFS2_COMPRESSION_OPTIONS=y

CONFIG_NFS_FS=m

CONFIG_JFFS2_LZO=y

CONFIG_JFFS2_RUBIN=y

CONFIG_CRAMFS=y

CONFIG_MINIX_FS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

CONFIG_ROOT_NFS=y

CONFIG_NFSD=y

CONFIG_SMB_FS=m

CONFIG_CIFS=m

CONFIG_PARTITION_ADVANCED=y

CONFIG_AMIGA_PARTITION=y

CONFIG_NLS_DEFAULT="utf-8"

CONFIG_NLS_CODEPAGE_437=m

CONFIG_MAC_PARTITION=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_CODEPAGE_737=m

CONFIG_NLS_CODEPAGE_775=m

CONFIG_NLS_CODEPAGE_850=m

CONFIG_NLS_CODEPAGE_1250=m

CONFIG_NLS_CODEPAGE_1251=m

CONFIG_NLS_ASCII=m

CONFIG_NLS_ISO8859_1=m

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_ISO8859_2=m

CONFIG_NLS_ISO8859_3=m

CONFIG_NLS_ISO8859_4=m

CONFIG_NLS_ISO8859_15=m

CONFIG_NLS_KOI8_R=m

CONFIG_NLS_KOI8_U=m

CONFIG_NLS_UTF8=m

CONFIG_NLS_UTF8=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_LL=y

CONFIG_CRYPTO_NULL=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_SHA256=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_LIBCRC32C=m

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

# CONFIG_FTRACE is not set

CONFIG_CRYPTO_PCBC=y

CONFIG_CRYPTO_SHA1=y

CONFIG_EXPERIMENTAL=y

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_AT91=y

CONFIG_ARCH_AT91RM9200DK=y

CONFIG_MACH_ECO920=y

CONFIG_AT91_PROGRAMMABLE_CLOCKS=y

# CONFIG_ARM_THUMB is not set

CONFIG_PCCARD=y

CONFIG_AT91_CF=y

CONFIG_LEDS=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x20410000,3145728 root=/dev/ram0 rw"

CONFIG_FPE_NWFPE=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_BOOTP=y

# CONFIG_IPV6 is not set

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_JEDECPROBE=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_PHYSMAP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_ARM_AT91_ETHER=y

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

CONFIG_SERIAL_ATMEL=y

CONFIG_SERIAL_ATMEL_CONSOLE=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_GPIO=y

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_AT91RM9200_WATCHDOG=y

# CONFIG_VGA_CONSOLE is not set

# CONFIG_USB_HID is not set

CONFIG_USB=y

CONFIG_USB_DEBUG=y

CONFIG_USB_DEVICEFS=y

CONFIG_USB_MON=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_GADGET=y

CONFIG_MMC=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_AT91RM9200=y

CONFIG_EXT2_FS=y

CONFIG_INOTIFY=y

CONFIG_TMPFS=y

CONFIG_CRAMFS=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_LL=y