| commit | f21c46db0ffb47e17a5670d9eb224ed7e101a28f | [log] [tgz] |
|---|---|---|
| author | John Newlin <jnewlin@google.com> | Thu Oct 09 09:02:09 2014 -0700 |
| committer | John Newlin <jnewlin@google.com> | Thu Oct 09 12:55:04 2014 -0700 |
| tree | e479ea4c81fae49607b1496e9061548c4f635c93 | |
| parent | c453d0522670be10d15bc0c7ba863a2defb99324 [diff] | |
| parent | 72fe34aa3b1a4326cca467a4ac2beb7edc74fc47 [diff] |
Merge branch 'rc22' into merge_rc22 Change-Id: Ief83e5c1e202a74cf633a8c774df5ae6978a2767
diff --git a/arch/arm/mach-feroceon-kw2/include/mach/system.h b/arch/arm/mach-feroceon-kw2/include/mach/system.h old mode 100755 new mode 100644 index 7fa7c8e..393cf1b --- a/arch/arm/mach-feroceon-kw2/include/mach/system.h +++ b/arch/arm/mach-feroceon-kw2/include/mach/system.h
@@ -31,7 +31,7 @@ cpu_do_idle(); } -#define UPON_SDK_VERSION "uPON_2.7.25_RC14" +#define UPON_SDK_VERSION "uPON_2.7.25_RC22" #ifdef __BIG_ENDIAN #define MV_ARM_32BIT_LE(X) ((((X)&0xff)<<24) | \