[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-mips-cvs
Subject:    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
From:       linux-mips () linux-mips ! org
Date:       2011-11-28 11:13:52
Message-ID: S1904731Ab1K1LNz/20111128111355Z+3058 () eddie ! linux-mips ! org
[Download RAW message or body]

Author: Ralf Baechle <ralf@linux-mips.org> Mon Nov 28 11:13:46 2011 +0000
Commit: 9cb29211eb4167239891b466a982fe34fd75631d
Gitweb: http://git.linux-mips.org/g/ralf/linux/9cb29211eb41
Branch: master

---

 arch/powerpc/boot/dts/p1023rds.dts      |   17 +++++++++++++----
 arch/powerpc/configs/ppc44x_defconfig   |    2 ++
 arch/powerpc/mm/hugetlbpage.c           |    1 +
 arch/powerpc/platforms/85xx/Kconfig     |    2 +-
 arch/powerpc/platforms/85xx/p3060_qds.c |    2 +-
 arch/powerpc/sysdev/ehv_pic.c           |    1 +
 arch/powerpc/sysdev/fsl_lbc.c           |    1 +
 arch/powerpc/sysdev/qe_lib/qe.c         |    2 +-
 drivers/crypto/mv_cesa.c                |   12 +++++++-----
 drivers/edac/mpc85xx_edac.c             |    2 +-
 drivers/gpio/gpio-pca953x.c             |    4 ++--
 drivers/net/wireless/ath/ath9k/hw.c     |    3 ++-
 drivers/staging/iio/industrialio-core.c |   19 +++++++++----------
 drivers/video/da8xx-fb.c                |   15 ++++++++++++++-
 drivers/video/omap/dispc.c              |    1 +
 drivers/video/omap2/dss/dispc.c         |   11 +++++------
 drivers/video/omap2/dss/hdmi.c          |    2 +-
 drivers/video/via/share.h               |    4 ++--
 18 files changed, 65 insertions(+), 36 deletions(-)

[prev in list] [next in list] [prev in thread] [next in thread]