Skip to content
Commit 1bf1aace authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'samsung-fixes-4' of git://github.com/kgene/linux-samsung 

* 'samsung-fixes-4' of git://github.com/kgene/linux-samsung:
  ARM: S3C24XX: Fix s3c24xx build errors if !CONFIG_PM
  ARM: S5P: fix offset calculation on gpio-interrupt
parents 5117cc25 fb630b9f
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