[XFS] Fix merge failures
[pandora-kernel.git] / arch / powerpc / include / asm / page_32.h
2008-12-29 Lachlan McIlroy[XFS] Fix merge failures
2008-12-29 Linus TorvaldsMerge branch 'next' of git://git./linux/kernel/git...
2008-12-28 Ilya Yanokpowerpc/44x: Support 16K/64K base page sizes on 44x
2008-12-25 Takashi IwaiMerge branch 'topic/snd-hrtimer' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/jack-mechanical' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/aoa' into to-push
2008-12-20 Takashi IwaiMerge branch 'topic/pcsp-fix' into topic/misc
2008-12-19 Takashi IwaiMerge branch 'fix/hda' into topic/hda
2008-11-30 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-26 Takashi IwaiMerge branch 'topic/misc' into topic/pcsp-fix
2008-11-25 Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-21 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/sound...
2008-11-18 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/misc...
2008-11-12 Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-10 Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/hda...
2008-11-06 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-06 Ingo MolnarMerge branch 'iommu-fixes-2.6.28' of git://git./linux...
2008-11-05 James MorrisMerge branch 'master' into next
2008-11-03 Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/hda...
2008-10-31 Takashi IwaiMerge commit 'v2.6.28-rc2' into topic/asoc
2008-10-30 Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/asoc...
2008-10-29 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/misc...
2008-10-28 Ingo MolnarMerge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot...
2008-10-28 Paul MundtMerge branches 'sh/serial-rework' and 'sh/oprofile'
2008-10-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-27 Takashi IwaiMerge branches 'topic/fix/asoc', 'topic/fix/hda', ...
2008-10-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-25 Len BrownMerge branch 'i7300_idle' into release
2008-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-10-23 Takashi IwaiMerge branches 'topic/asoc', 'topic/misc-fixes' and...
2008-10-23 Linus TorvaldsMerge branch 'for-2.6.28' of git://linux-nfs.org/~bfiel...
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/czankel/xtensa-2.6
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-23 Haavard SkinnemoenMerge branches 'boards' and 'fixes' of git://git./linux...
2008-10-23 Len BrownMerge branch 'linus' into test
2008-10-20 Linus TorvaldsMerge git://git./linux/kernel/git/kyle/parisc-2.6
2008-10-20 Linus TorvaldsMerge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
2008-10-20 Linus TorvaldsMerge branch 'tracing-v28-for-linus' of git://git....
2008-10-20 Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-10-20 Linus TorvaldsMerge branch 'genirq-v28-for-linus' of git://git./linux...
2008-10-20 Linus TorvaldsMerge branch 'core-fixes-for-linus' of git://git./linux...
2008-10-20 Linus TorvaldsMerge branch 'next' of git://git./linux/kernel/git...
2008-10-20 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2008-10-20 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-20 Linus TorvaldsMerge branch 'linux-next' of git://git.infradead.org...
2008-10-20 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-10-20 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-10-20 David VrabelMerge branch 'master' into for-upstream
2008-10-20 Takashi IwaiMerge branches 'topic/asoc', 'topic/misc-fixes', 'topic...
2008-10-20 Thomas GleixnerMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-20 Thomas GleixnerMerge branches 'timers/clocksource', 'timers/hrtimers...
2008-10-20 Paul MundtMerge branch 'master' of git://git./linux/kernel/git...
2008-10-19 Ingo MolnarMerge branch 'linus' into tracing-v28-for-linus-v3
2008-10-18 Anton VorontsovMerge branch 'master' of git://git./linux/kernel/git...
2008-10-17 Tony LuckPull utrace into release branch
2008-10-17 Linus TorvaldsMerge git://git./linux/kernel/git/gregkh/staging-2.6
2008-10-17 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-17 Arjan van de VenMerge commit 'linus/master' into merge-linus
2008-10-17 Linus TorvaldsMerge branch 'for-linus' of git://www.jni.nu/cris
2008-10-17 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-misc-2.6
2008-10-17 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-10-17 Ingo MolnarMerge branch 'linus' into sched/urgent
2008-10-17 Ingo MolnarMerge branch 'linus' into core/urgent
2008-10-16 Linus TorvaldsMerge branch 'sched-fixes-for-linus' of git://git....
2008-10-16 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-16 Linus TorvaldsMerge branch 'kvm-updates/2.6.28' of git://git./linux...
2008-10-16 Linus TorvaldsMerge branch 'core-v28-for-linus' of git://git./linux...
2008-10-16 Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-10-16 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-16 Linus TorvaldsMerge branch 'agp-next' of git://git./linux/kernel...
2008-10-16 Linus TorvaldsMerge branch 'docs' of git://git.lwn.net/linux-2.6
2008-10-16 Linus TorvaldsMerge branch 'for-linus' of git://neil.brown.name/md
2008-10-16 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-16 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-16 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-10-16 Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2008-10-16 Dmitry TorokhovMerge branch 'next' into for-linus
2008-10-15 Trond MyklebustMerge branch 'next'
2008-10-15 Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2008-10-15 Linus TorvaldsMerge branch 'build_fix' of git://git./linux/kernel...
2008-10-15 Linus TorvaldsMerge branch 'next' of git://git./linux/kernel/git...
2008-10-15 Benjamin HerrenschmidtMerge commit 'origin'
2008-10-13 Linus TorvaldsMerge git://git./linux/kernel/git/brodo/pcmcia-2.6
2008-10-13 Ingo MolnarMerge branch 'linus' into oprofile-v2
2008-10-12 Ingo MolnarMerge branches 'x86/xen', 'x86/build', 'x86/microcode...
2008-10-10 Benjamin HerrenschmidtMerge commit 'jk/jk-merge'
2008-10-07 Benjamin HerrenschmidtMerge commit 'jwb/jwb-next'
2008-10-06 Ingo MolnarMerge branches 'x86/alternatives', 'x86/cleanups',...
2008-10-06 Ingo MolnarMerge branch 'x86/header-guards' into x86-v28-for-linus...
2008-10-03 Ingo MolnarMerge commit 'v2.6.27-rc8' into x86/setup
2008-10-02 Ingo MolnarMerge commit 'v2.6.27-rc8' into genirq
2008-10-02 Benjamin HerrenschmidtMerge commit 'kumar/kumar-mmu'
2008-09-24 Becky BrucePOWERPC: Allow 32-bit hashed pgtable code to support...
2008-09-24 Ingo MolnarMerge commit 'v2.6.27-rc7' into x86/microcode
2008-09-24 Ingo MolnarMerge commit 'v2.6.27-rc7' into x86/pebs
2008-09-22 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-09-22 Ingo MolnarMerge commit 'v2.6.27-rc7' into x86/debug
2008-09-14 Ingo MolnarMerge commit 'v2.6.27-rc6' into timers/hpet
2008-09-10 Ingo MolnarMerge branch 'x86/pebs' into x86/unify-cpu-detect
next