Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2012-01-16 12:33:03 -0500
committerJeff Mahoney <jeffm@suse.com>2012-01-16 12:33:03 -0500
commit54ddfaf715bb674b71ddc452fef93876fdd91880 (patch)
treed3d4192eb8a98e857cee8fb1ab3c54e25019f2f7
parent42628fef356c6f75147620124109cb5bad7769ad (diff)
parentc99c00cfe59f8f158813b971be62fc902305fb1b (diff)
Merge branch 'SLE11-SP2' of kerncvs.suse.de:/home/git/kernel-source into SLE11-SP2
-rw-r--r--kernel-source.changes5
-rw-r--r--patches.kabi/struct-bootsplash_data2
2 files changed, 6 insertions, 1 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 3023f74795..8b79440b24 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -18,6 +18,11 @@ Mon Jan 16 18:32:21 CET 2012 - jeffm@suse.com
gfp_t from lock_extent.
-------------------------------------------------------------------
+Mon Jan 16 18:23:34 CET 2012 - mmarek@suse.cz
+
+- patches.kabi/struct-bootsplash_data: Fix typo.
+
+-------------------------------------------------------------------
Mon Jan 16 16:22:13 CET 2012 - mmarek@suse.cz
- patches.kabi/struct-bootsplash_data: bootsplash: Hide kabi
diff --git a/patches.kabi/struct-bootsplash_data b/patches.kabi/struct-bootsplash_data
index e4c15b817f..a5ee555b39 100644
--- a/patches.kabi/struct-bootsplash_data
+++ b/patches.kabi/struct-bootsplash_data
@@ -16,7 +16,7 @@ index 83285cb..b95a80b 100644
int splash_sboxes_yoff;
bool color_set;
-+#ifndef __GENKSYSM__
++#ifndef __GENKSYMS__
bool need_sync;
+#endif
};