diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-13 07:23:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-13 07:23:49 -0700 |
| commit | 951a730af4053f4d95214c492df25e2b4592ce93 (patch) | |
| tree | bf07377c0eddaaa6b1ea1d43e04b9f4bbb1c2ee8 /arch/blackfin/boot | |
| parent | 0898d2aa9db8b7770c83590d0326d0e6b62cef2b (diff) | |
| parent | 08b67faa23fdd4df3f3f7bb06f0ad67b7366d11c (diff) | |
Merge tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux
Pull blackfin updates from Steven Miao.
* tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
blackfin: Ignore generated uImages
blackfin: Add STMMAC platform data to enable dwmac1000 driver on BF60x.
bf609: adv7343: add S-Video and Component output support
bf609: add adv7343 video encoder support
clock: add stmmac clock for ethernet driver
blackfin: scb: Add SCB1 to SCB9 config options and data.
blackfin: scb: Add system crossbar init code.
Diffstat (limited to 'arch/blackfin/boot')
| -rw-r--r-- | arch/blackfin/boot/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/blackfin/boot/.gitignore b/arch/blackfin/boot/.gitignore index 229e5080867..1287a5487e7 100644 --- a/arch/blackfin/boot/.gitignore +++ b/arch/blackfin/boot/.gitignore @@ -1,2 +1,3 @@ vmImage* vmlinux* +uImage* |