]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5b04f27) | patch
Blackfin arch: fix merge errors during 2.6.26 upgrade
authorMike Frysinger <vapier.adi@gmail.com>
Wed, 8 Oct 2008 09:39:02 +0000 (17:39 +0800)
committerBryan Wu <cooloney@kernel.org>
Wed, 8 Oct 2008 09:39:02 +0000 (17:39 +0800)
commit7eb2c23f602ab35c5f4227bc87945a3c78a14150
tree6b425917db9e1e01d4f815a2aedf7c55e19b9915tree | snapshot
parent5b04f271fe49bb7adb061de454d383c027a18de0commit | diff
Blackfin arch: fix merge errors during 2.6.26 upgrade

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
arch/blackfin/Kconfig diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.