Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 6cc96ddb authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/fixes-non-critical 

From Haojian Zhuang:
* 'armsoc/fix' of git://github.com/hzhuang1/linux:
  ARM: pxa: add dummy SA1100 rtc clock in pxa25x
parents 2054271b d90cb69d
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment