projects / linux-2.6-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6f9543f 52c76e4)
Merge tag 's3c24xx-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 20:18:40 +0000 (22:18 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 20:18:40 +0000 (22:18 +0200)
From Kukjin Kim:

based on tags/s3c24xx-dt-1
- update uart addresses in s3c2416-dt auxdata due to removing S3C2410_PA_UARTX

* tag 's3c24xx-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S3C24XX: update uart addresses in s3c2416-dt auxdata

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge
Linux 6.x block layer and io_uring tree(s)