Changes in README.marubun-pcmcia

52b1eaf93d6b55e1467f97b8eefdc2f8b6031c43 - Merge branch 'master' of git://git.denx.de/u-boot

Tue, 17 May 2016 15:51:44 +0000

Merge branch 'master' of git://git.denx.de/u-boot List of files: /rk3399_rockchip-uboot/doc/README.marubun-pcmcia

1cc0a9f49657734c54939f03fc1e3ca0ec9d7eef - Fix various typos, scattered over the code.

Wed, 04 May 2016 08:47:31 +0000

Fix various typos, scattered over the code.Spelling corrections for (among other things):* environment* override* variable* ftd (should be "fdt", for flattened device tree)* embedded* FTDI* emulation* controller List of files: /rk3399_rockchip-uboot/doc/README.marubun-pcmcia

cb5473205206c7f14cbb1e747f28ec75b48826e2 - Merge branch 'fixes' into cleanups

Wed, 17 Dec 2008 15:53:07 +0000

Merge branch 'fixes' into cleanupsConflicts: board/atmel/atngw100/atngw100.c board/atmel/atstk1000/atstk1000.c cpu/at32ap/at32ap700x/gpio.c include/asm-avr32/arch-at32ap700x/clk.h include/configs/atngw100.h include/configs/atstk1002.h include/configs/atstk1003.h include/configs/atstk1004.h include/configs/atstk1006.h include/configs/favr-32-ezkit.h include/configs/hammerhead.h include/configs/mimc200.h List of files: /rk3399_rockchip-uboot/doc/README.marubun-pcmcia

f61f1e150c84f5b9347fca79a4bc5f2286c545d2 - Merge branch 'master' of /home/stefan/git/u-boot/u-boot

Tue, 21 Oct 2008 09:43:08 +0000

Merge branch 'master' of /home/stefan/git/u-boot/u-boot List of files: /rk3399_rockchip-uboot/doc/README.marubun-pcmcia

50bd0057ba8fceeb48533f8b1a652ccd0e170838 - Merge git://git.denx.de/u-boot into x1

Tue, 21 Oct 2008 07:18:01 +0000

Merge git://git.denx.de/u-boot into x1Conflicts: drivers/usb/usb_ohci.c List of files: /rk3399_rockchip-uboot/doc/README.marubun-pcmcia

f82642e33899766892499b163e60560fbbf87773 - Merge 'next' branch

Sat, 18 Oct 2008 19:59:44 +0000

Merge 'next' branchConflicts: board/freescale/mpc8536ds/mpc8536ds.c include/configs/mgcoge.hSigned-off-by: Wolfgang Denk List of files: /rk3399_rockchip-uboot/doc/README.marubun-pcmcia

6d0f6bcf337c5261c08fabe12982178c2c489d76 - rename CFG_ macros to CONFIG_SYS

Thu, 16 Oct 2008 13:01:15 +0000

rename CFG_ macros to CONFIG_SYSSigned-off-by: Jean-Christophe PLAGNIOL-VILLARD List of files: /rk3399_rockchip-uboot/doc/README.marubun-pcmcia

1a247ba7fa5fb09f56892a09a990f03ce564b3e2 - Merge commit 'wd/master'

Fri, 06 Jun 2008 15:48:31 +0000

Merge commit 'wd/master' List of files: /rk3399_rockchip-uboot/doc/README.marubun-pcmcia

10a3367955bc2033b288915f8f10d0e507fe2fa1 - Merge branch 'master' of /home/stefan/git/u-boot/u-boot

Tue, 03 Jun 2008 18:19:08 +0000

Merge branch 'master' of /home/stefan/git/u-boot/u-boot List of files: /rk3399_rockchip-uboot/doc/README.marubun-pcmcia

53677ef18e25c97ac613349087c5cb33ae5a2741 - Big white-space cleanup.

Tue, 20 May 2008 14:00:29 +0000

Big white-space cleanup.This commit gets rid of a huge amount of silly white-space issues.Especially, all sequences of SPACEs followed by TAB characters getremoved (unless they appear in print statements).Also remove all embedded "vim:" and "vi:" statements which hideindentation problems.Signed-off-by: Wolfgang Denk List of files: /rk3399_rockchip-uboot/doc/README.marubun-pcmcia

6a40ef62c4300e9f606deef0a4618cbc4b514a51 - Merge git://www.denx.de/git/u-boot

Wed, 09 Jan 2008 12:57:10 +0000

Merge git://www.denx.de/git/u-bootConflicts: board/tqm5200/tqm5200.c List of files: /rk3399_rockchip-uboot/doc/README.marubun-pcmcia

4985ca5af3767ffe13ea96e1dc26f88c81084414 - Merge with git://www.denx.de/git/u-boot.git

Mon, 07 Jan 2008 15:34:22 +0000

Merge with git://www.denx.de/git/u-boot.git List of files: /rk3399_rockchip-uboot/doc/README.marubun-pcmcia

2c3536425d987bf079258973e2acebaaef3e16b6 - Merge commit 'wd/master'

Thu, 03 Jan 2008 15:46:55 +0000

Merge commit 'wd/master' List of files: /rk3399_rockchip-uboot/doc/README.marubun-pcmcia

feaa43f3a8f465cbf01ffa1b23b6b52431819a52 - Merge branch 'for-1.3.2-ver2'

Sat, 29 Dec 2007 08:23:11 +0000

Merge branch 'for-1.3.2-ver2'Conflicts: cpu/ppc4xx/fdt.c include/configs/kilauea.h include/configs/sequoia.hSigned-off-by: Stefan Roese List of files: /rk3399_rockchip-uboot/doc/README.marubun-pcmcia

bb701283a8dcb2521000fe437f19a83cadc98b02 - Merge branch 'master' of /home/stefan/git/u-boot/u-boot into for-1.3.2-ver2

Thu, 27 Dec 2007 18:37:26 +0000

Merge branch 'master' of /home/stefan/git/u-boot/u-boot into for-1.3.2-ver2 List of files: /rk3399_rockchip-uboot/doc/README.marubun-pcmcia

61fb15c516fef5631e305f1976d7b3a679725856 - Fix coding style issues; update CHANGELOG.

Thu, 27 Dec 2007 00:52:50 +0000

Fix coding style issues; update CHANGELOG.Signed-off-by: Wolfgang Denk List of files: /rk3399_rockchip-uboot/doc/README.marubun-pcmcia

6e1bbe6e3edf5f508de89114577ce7b7caa89c8a - Merge branch 'master' of /home/wd/git/u-boot/custodians

Thu, 27 Dec 2007 00:13:05 +0000

Merge branch 'master' of /home/wd/git/u-boot/custodians List of files: /rk3399_rockchip-uboot/doc/README.marubun-pcmcia

81b38be8631a0b809c97ab3d929f491373d7314f - Merge branch 'master' of git://www.denx.de/git/u-boot-sh

Thu, 27 Dec 2007 00:12:56 +0000

Merge branch 'master' of git://www.denx.de/git/u-boot-shConflicts: MAINTAINERSSigned-off-by: Wolfgang Denk List of files: /rk3399_rockchip-uboot/doc/README.marubun-pcmcia

33ecdc2f9d64926e1a6067b28f3a0aefc3b6d23d - sh: Add marubun's pcmcia driver

Sat, 24 Nov 2007 17:39:31 +0000

sh: Add marubun's pcmcia driverMarubun pcmcia is a chip for PCMCIA used with SuperH.Of course, this can be used even by other architectures.When use this driver, came to be able to use CompactFlashand Ethernet.Signed-off-by: Nobuhiro Iwamatsu List of files: /rk3399_rockchip-uboot/doc/README.marubun-pcmcia