Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Mon, 19 Nov 2012 21:18:48 +0000 (22:18 +0100)
committerMichal Marek <mmarek@suse.cz>
Mon, 19 Nov 2012 21:18:48 +0000 (22:18 +0100)
commit48bf79ee29b280f6598d2e2939988e7e9d271ead
tree7980169018a65f0663334b22f430c056d73a9ced
parentd12d56edc2c472ccb8bb1d00d38c1e5679f0a79d
parent8040d2be657ca718da993298490b31a1d3ce74dc
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
patches.fixes/scsi-update-scsi.h-with-SYNCHRONIZE_CACHE_16.patch
rpm/kernel-source.changes.old
series.conf
Delete
patches.fixes/smp-introduce-a-generic-on_each_cpu_mask-function.patch,
which has already been present in SP3 under a different name, and move
patches.fixes/smp-add-func-to-IPI-cpus-based-on-parameter-func.patch
down in the series.

suse-commit: 787bab5e8158017cc2b249ed7898a24b417f187a