Skip to content
This repository has been archived by the owner on Oct 21, 2022. It is now read-only.

Commit

Permalink
Merge branch 'pxa-palm' into pxa-machines
Browse files Browse the repository at this point in the history 
Conflicts:

	drivers/mfd/Kconfig
	drivers/pcmcia/Makefile
  • Loading branch information
Russell King authored and Russell King committed Oct 7, 2008
2 parents 5ff7f78 + 4e9687d commit 1543966
Show file tree
Hide file tree
Showing 20 changed files with 2,403 additions and 452 deletions.
6 changes: 6 additions & 0 deletions MAINTAINERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,12 @@ M: marek.vasut@gmail.com
W: http://hackndev.com
S: Maintained

ARM/PALMZ72 SUPPORT
P: Sergey Lapin
M: slapin@ossfans.org
W: http://hackndev.com
S: Maintained

ARM/PLEB SUPPORT
P: Peter Chubb
M: pleb@gelato.unsw.edu.au
Expand Down
Loading

0 comments on commit 1543966

Please sign in to comment.