Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-14 23:25:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
a9aff3eaaf
linux/arch
History
H. Peter Anvin a9aff3eaaf Merge branch x86/build into x86/efi and fix up arch/x86/boot/tools/build.c 
Reason for merge:
       The updates to the EFI boot stub generation conflicted with the
       changes to properly use the get/put_unaligned_le*() macros to
       generate images.

       This merge commit completes the conversion in
       arch/x86/boot/tools/build.c including the places in the code
       which had been changed on the x86/efi branch.

Resolved Conflicts:
	arch/x86/boot/tools/build.c

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2012-03-28 13:11:36 -07:00
..
alpha alpha: fix 32/64-bit bug in futex support 2012-03-05 15:49:43 -08:00
arm SH/R-Mobile fixes for 3.3-rc. 2012-03-12 22:47:20 -07:00
avr32 avr32: select generic atomic64_t support 2012-02-03 16:16:40 -08:00
blackfin Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci 2012-01-11 18:50:26 -08:00
c6x C6X: remove dead code from entry.S 2012-03-16 09:27:57 -04:00
cris lib: use generic pci_iomap on all architectures 2012-01-10 18:04:27 -08:00
frv Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers 2012-01-14 18:03:30 -08:00
h8300 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci 2012-01-11 18:50:26 -08:00
hexagon
ia64 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux 2012-01-18 15:51:48 -08:00
m32r Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers 2012-01-14 18:03:30 -08:00
m68k m68k: Do not set global share for non-kernel shared pages 2012-02-07 11:25:57 +10:00
microblaze Revert "microblaze: Add topology init" 2012-01-31 09:06:52 +01:00
mips MIPS: traps.c: Fix typo 2012-02-20 18:33:20 +01:00
mn10300 Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers 2012-01-14 18:03:30 -08:00
openrisc openrisc: Fix up audit_syscall_[entry|exit]() usage 2012-02-17 09:53:12 +01:00
parisc [PARISC] don't unconditionally override CROSS_COMPILE for 64 bit. 2012-02-28 09:39:28 -06:00
powerpc powerpc: Fix various issues with return to userspace 2012-02-22 16:48:53 +11:00
s390 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 2012-03-01 18:22:55 -08:00
score score: fix off-by-one index into syscall table 2012-01-23 08:38:49 -08:00
sh sh: fix up the ubc clock definition for sh7785. 2012-03-07 15:28:32 +09:00
sparc sparc32: Add -Av8 to assembler command line. 2012-03-13 18:19:51 -07:00
tile arch/tile/configs: convert to minimal configs via "make savedefconfig" 2012-03-14 14:33:16 -04:00
um Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit 2012-01-17 16:41:31 -08:00
unicore32 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci 2012-01-11 18:50:26 -08:00
x86 Merge branch x86/build into x86/efi and fix up arch/x86/boot/tools/build.c 2012-03-28 13:11:36 -07:00
xtensa xtensa: fix memscan() 2012-02-03 16:16:40 -08:00
.gitignore
Kconfig mm,x86,um: move CMPXCHG_DOUBLE config option 2012-01-12 20:13:03 -08:00