[U-Boot] Pull request: u-boot-staging

[Wolfgang Denk]

Dear Anatolij Gustschin,

In message <20120901144454.42208737 at wker> you wrote:
> Hello Wolfgang,
> 
> The following changes since commit 4d3c95f5ea7c737a21cd6b9c59435ee693b3f127:
> 
>   zfs: Add ZFS filesystem support (2012-08-09 23:42:20 +0200)
> 
> are available in the git repository at:
>   git://git.denx.de/u-boot-staging.git agust at denx.de
> 
> Khem Raj (1):
>       config: Always use GNU ld
> 
> Luka Perkov (1):
>       tools: add kwboot binary to .gitignore file
> 
> Michal Simek (2):
>       serial: CONSOLE macro is not used
>       fdt: Include arch specific gpio.h instead of asm-generic/gpio.h
> 
> Vikram Narayanan (1):
>       tx25: Use generic gpio_* calls

I get a merge conflict for board/karo/tx25/tx25.c, due to the
previously applied IMX_GPIO_NR patches.  I tried to reslve this, but
please double-check.



Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Never give in.  Never give in.  Never. Never. Never."
- Winston Churchill