| commit | 7cc3ba019aee913d09e7bf0b6711da2e1f6b2db4 | |
| author | Matt Fleming <matt.fleming@intel.com> | |
| Thu, 19 Jul 2012 15:03:19 +0000 (19 16:03 +0100) | ||
| committer | Matt Fleming <matt.fleming@intel.com> | |
| Thu, 19 Jul 2012 15:07:01 +0000 (19 16:07 +0100) | ||
| tree | 944e4a5f9967abe993c47d66bf89b4e0ef8cfb07 | treesnapshot (tar.gz zip) |
| parent | f351d07ddc7f1d7ed786d88f5725db20ef288439 | commitdiff |
| parent | 0a0e0e41cad93cd16c323cf16f40264a21eedd6c | commitdiff |
Merge branch 'master' into elflink
The reason for this merge is that we need the fix to core/fs/cache.c
without which we can potentially dereference an invalid pointer.
The below conflict is a result of the new setup_data blob code being
merged from the master branch.
Conflicts:
com32/lib/Makefile
The reason for this merge is that we need the fix to core/fs/cache.c
without which we can potentially dereference an invalid pointer.
The below conflict is a result of the new setup_data blob code being
merged from the master branch.
Conflicts:
com32/lib/Makefile