Please pull merge branch

[Grant Likely]

Hi Paul/Ben,

Here is a bug fix, a minor tweak and a tidy to merge for 2.6.30.
Please pull 'merge' branch of git://git.secretlab.ca/git/linux-2.6

Thanks,
g.

The following changes since commit 56a50adda49b2020156616c4eb15353e0f9ad7de:
  Linus Torvalds (1):
        Merge branch 'drm-intel-next' of
git://git.kernel.org/.../anholt/drm-intel

are available in the git repository at:

  git://git.secretlab.ca/git/linux-2.6 merge

Grant Likely (2):
      powerpc: Update MPC5xxx and Xilinx Virtex maintainer entries
      powerpc/virtex: Add uImage to the default images list

John Linn (1):
      powerpc/virtex: Fix duplicate level irq events.

 MAINTAINERS                        |    4 +-
 arch/powerpc/platforms/40x/Kconfig |    1 +
 arch/powerpc/platforms/44x/Kconfig |    1 +
 arch/powerpc/sysdev/xilinx_intc.c  |  117 ++++++++++++++++++++++++++++++++---
 4 files changed, 111 insertions(+), 12 deletions(-)


-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.