| Message ID | 20120901144454.42208737@wker |
|---|---|
| State | Accepted |
| Delegated to: | Wolfgang Denk |
| Headers | show |
Dear Anatolij Gustschin, In message <20120901144454.42208737@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@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
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@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 board/karo/tx25/tx25.c | 25 +++++++++---------------- config.mk | 6 +++++- drivers/serial/serial.c | 3 --- lib/fdtdec.c | 3 +-- tools/.gitignore | 1 + 5 files changed, 16 insertions(+), 22 deletions(-) Please pull. Thanks! Anatolij