* [PULL] Various xscale fixes
@ 2010-07-26 20:04 Marek Vasut
2010-07-28 1:24 ` Eric Miao
0 siblings, 1 reply; 3+ messages in thread
From: Marek Vasut @ 2010-07-26 20:04 UTC (permalink / raw)
To: linux-arm-kernel
Eric, can you please pull these changes into your -devel? Thanks!
The following changes since commit 9f5f3423ac0d786ff87ee80e7c5292b43fe0b4f9:
Merge branch 'devel' of
git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
(2010-07-22 17:14:02 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/marex/pxa-linux-2.6.git for-
eric-devel
Marek Vasut (8):
pxa: Introduce Palm27x
pxa: Flip Palm LD, TX, T5, Z72 to Palm27x
pxa: Add core pmic support for Palm27x
pxa: Modularize remnants of code in Palms
pxa/spitz: Rework spitz
pxa/spitz: Formating and naming fixes
PXA: Fix ZipitZ2 flash layout typo
Merge branch 'palm' into for-eric-devel
arch/arm/mach-pxa/Kconfig | 7 +
arch/arm/mach-pxa/Makefile | 1 +
arch/arm/mach-pxa/include/mach/palm27x.h | 48 ++
arch/arm/mach-pxa/include/mach/spitz.h | 6 +
arch/arm/mach-pxa/palm27x.c | 532 ++++++++++++++++++++++
arch/arm/mach-pxa/palmld.c | 301 +++----------
arch/arm/mach-pxa/palmt5.c | 289 ++-----------
arch/arm/mach-pxa/palmtreo.c | 371 +++-------------
arch/arm/mach-pxa/palmtx.c | 307 +++-----------
arch/arm/mach-pxa/palmz72.c | 269 ++----------
arch/arm/mach-pxa/spitz.c | 724 ++++++++++++++++++------------
arch/arm/mach-pxa/z2.c | 2 +-
12 files changed, 1265 insertions(+), 1592 deletions(-)
create mode 100644 arch/arm/mach-pxa/include/mach/palm27x.h
create mode 100644 arch/arm/mach-pxa/palm27x.c
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PULL] Various xscale fixes
2010-07-26 20:04 [PULL] Various xscale fixes Marek Vasut
@ 2010-07-28 1:24 ` Eric Miao
2010-07-29 2:51 ` Marek Vasut
0 siblings, 1 reply; 3+ messages in thread
From: Eric Miao @ 2010-07-28 1:24 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jul 27, 2010 at 4:04 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
> Eric, can you please pull these changes into your -devel? Thanks!
>
> The following changes since commit 9f5f3423ac0d786ff87ee80e7c5292b43fe0b4f9:
>
> ?Merge branch 'devel' of
> git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
> (2010-07-22 17:14:02 +0200)
>
For a simpler history, could you please either rebase on my -devel tip
or rebase on a certain -rcN tagline?
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PULL] Various xscale fixes
2010-07-28 1:24 ` Eric Miao
@ 2010-07-29 2:51 ` Marek Vasut
0 siblings, 0 replies; 3+ messages in thread
From: Marek Vasut @ 2010-07-29 2:51 UTC (permalink / raw)
To: linux-arm-kernel
Dne St 28. ?ervence 2010 03:24:03 Eric Miao napsal(a):
> On Tue, Jul 27, 2010 at 4:04 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
> > Eric, can you please pull these changes into your -devel? Thanks!
> >
> > The following changes since commit
> > 9f5f3423ac0d786ff87ee80e7c5292b43fe0b4f9:
> >
> > Merge branch 'devel' of
> > git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into
> > devel (2010-07-22 17:14:02 +0200)
>
> For a simpler history, could you please either rebase on my -devel tip
> or rebase on a certain -rcN tagline?
Ok, this should be it:
The following changes since commit 9d89308d8166a5588e49a3e3303995ccf101e9c0:
[ARM] pxa: removed mostly unused and confusing two sharpsl.h (2010-07-05
00:06:25 +0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/marex/pxa-linux-2.6.git for-
eric-devel
Marek Vasut (13):
[ARM] pxa/palm: Introduce Palm27x
[ARM] pxa/palm: Flip Palm LD,TX,T5,Z72 to Palm27x
[ARM] pxa/palm: Add core pmic support for Palm27x
[ARM] pxa/palm: Modularize rest of code in Palms
[ARM] pxa/spitz: Rework spitz
[ARM] pxa/spitz: Formating and naming fixes
[ARM] pxa/z2: Fix flash layout typo
[ARM] pxa/balloon3: Machine file cleanup
[ARM] pxa/balloon3: Machine file cleanup
[ARM] pxa/balloon3: PCMCIA Support
[ARM] pxa/balloon3: PCF857x GPIO expander and LEDs
[ARM] pxa/balloon3: Add NAND driver
[ARM] pxa/balloon3: Add MAX1586 PMIC support
arch/arm/mach-pxa/Kconfig | 7 +
arch/arm/mach-pxa/Makefile | 1 +
arch/arm/mach-pxa/balloon3.c | 777 +++++++++++++++++++++++------
arch/arm/mach-pxa/include/mach/balloon3.h | 31 +-
arch/arm/mach-pxa/include/mach/palm27x.h | 48 ++
arch/arm/mach-pxa/include/mach/spitz.h | 6 +
arch/arm/mach-pxa/palm27x.c | 532 ++++++++++++++++++++
arch/arm/mach-pxa/palmld.c | 301 +++---------
arch/arm/mach-pxa/palmt5.c | 289 ++----------
arch/arm/mach-pxa/palmtreo.c | 371 +++-----------
arch/arm/mach-pxa/palmtx.c | 307 ++----------
arch/arm/mach-pxa/palmz72.c | 269 +---------
arch/arm/mach-pxa/spitz.c | 724 ++++++++++++++++-----------
arch/arm/mach-pxa/z2.c | 2 +-
drivers/pcmcia/Kconfig | 2 +-
drivers/pcmcia/Makefile | 1 +
drivers/pcmcia/pxa2xx_balloon3.c | 199 ++++++++
17 files changed, 2107 insertions(+), 1760 deletions(-)
create mode 100644 arch/arm/mach-pxa/include/mach/palm27x.h
create mode 100644 arch/arm/mach-pxa/palm27x.c
create mode 100644 drivers/pcmcia/pxa2xx_balloon3.c
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-07-29 2:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-26 20:04 [PULL] Various xscale fixes Marek Vasut
2010-07-28 1:24 ` Eric Miao
2010-07-29 2:51 ` Marek Vasut
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).