Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Wed, 20 Mar 2013 08:32:01 +0000 (09:32 +0100)
committerMichal Marek <mmarek@suse.cz>
Wed, 20 Mar 2013 08:32:01 +0000 (09:32 +0100)
commitd9f35475c8146f68dd512dfce05a358f000e616e
treef5b276af0016a32bbdc8a4593e0ee9b6d8f049e6
parent65bb817db43ecaf0e3c868c316063bd93570d91b
parente4b3f4e3f536d6da98ddd97b179d5daaf7edf09e
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
config/*
kernel-source.changes
series.conf

suse-commit: b73da7c1dcc3d0c708cdce2989468fbd59a374d9
block/blk-core.c
drivers/usb/host/xhci-ring.c
fs/ext4/inode.c
include/linux/fs.h
include/linux/pagemap.h
mm/Kconfig
mm/filemap.c