- Update to 2.6.22-rc5-git5.
authorJeff Mahoney <jeffm@suse.de>
Thu, 21 Jun 2007 22:30:31 +0000 (22:30 +0000)
committerJeff Mahoney <jeffm@suse.de>
Thu, 21 Jun 2007 22:30:31 +0000 (22:30 +0000)
suse-commit: c2cc5b6f99a9e428d343955400cf07d9570feb74

12 files changed:
1  2 
Makefile
arch/i386/Kconfig.debug
arch/powerpc/platforms/powermac/setup.c
arch/x86_64/Kconfig.debug
drivers/macintosh/Kconfig
drivers/net/bonding/bond_3ad.c
drivers/net/bonding/bond_main.c
drivers/net/bonding/bond_sysfs.c
drivers/net/bonding/bonding.h
fs/xfs/linux-2.6/xfs_lrw.c
kernel/sched.c
kernel/signal.c

diff --cc Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 22
--EXTRAVERSION = -rc5
++EXTRAVERSION = -rc5-git5
  NAME = Holy Dancing Manatees, Batman!
  
  # *DOCUMENTATION*
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
diff --cc kernel/signal.c
Simple merge