]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Sep 2009 15:32:05 +0000 (08:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Sep 2009 15:32:05 +0000 (08:32 -0700)
* 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score:
  score: update email address in MAINTAINERS.
  score: Cleanup linker script using new macros.
  score: Make THREAD_SIZE available to assembly files.
  score: Make PAGE_SIZE available to assembly.

1  2 
MAINTAINERS

diff --combined MAINTAINERS
index d8973ca86f2a495646dd91e81b16d3bcc5701a0c,4467da2a4d7a39598cd90070a5c7336bbe9f2c00..ed6cd99a57badb6291c1f702f4446b3a9a4c0ed4
@@@ -3527,6 -3527,7 +3527,6 @@@ F:      drivers/net/natsemi.
  
  NCP FILESYSTEM
  M:    Petr Vandrovec <vandrove@vc.cvut.cz>
 -L:    linware@sh.cvut.cz
  S:    Maintained
  F:    fs/ncpfs/
  
@@@ -3768,13 -3769,7 +3768,13 @@@ OMAP MMC SUPPOR
  M:    Jarkko Lavinen <jarkko.lavinen@nokia.com>
  L:    linux-omap@vger.kernel.org
  S:    Maintained
 -F:    drivers/mmc/host/*omap*
 +F:    drivers/mmc/host/omap.c
 +
 +OMAP HS MMC SUPPORT
 +M:    Madhusudhan Chikkature <madhu.cr@ti.com>
 +L:    linux-omap@vger.kernel.org
 +S:    Maintained
 +F:    drivers/mmc/host/omap_hsmmc.c
  
  OMAP RANDOM NUMBER GENERATOR SUPPORT
  M:    Deepak Saxena <dsaxena@plexity.net>
@@@ -4465,7 -4460,7 +4465,7 @@@ SCORE ARCHITECTUR
  P:    Chen Liqin
  M:    liqin.chen@sunplusct.com
  P:    Lennox Wu
- M:    lennox.wu@sunplusct.com
+ M:    lennox.wu@gmail.com
  W:    http://www.sunplusct.com
  S:    Supported