Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Thu, 3 Oct 2013 07:49:45 +0000 (09:49 +0200)
committerMichal Marek <mmarek@suse.cz>
Thu, 3 Oct 2013 07:49:45 +0000 (09:49 +0200)
commitdb51d0a907f1b4fe25ab6e97cd085b9d24d839bb
tree384cd0672e292fcd060540d7e20b5b55ac31d74a
parentd6665d62a4fae0eb8514d33e788bb614bd930acb
parentebdcbf11a73b4858756283bbce35156d09c9d790
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
kernel-source.changes
Refreshed:
patches.drivers/sfc-0016-sfc-Move-the-Solarflare-drivers.patch
patches.drivers/sfc-0064-sfc-Replace-efx_rx_buffer-is_page-and-other-booleans.patch
patches.drivers/sfc-0016-sfc-Move-the-Solarflare-drivers.patch
patches.drivers/sfc-0064-sfc-Replace-efx_rx_buffer-is_page-and-other-booleans.patch
series.conf